flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #294 from tonibm19/patch-3

Browse Source 
Correct wool drops when shearing a sheep.
This commit is contained in:
Mattes D 2013-10-28 11:51:46 -07:00
commit 65b43604a5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/Mobs/Sheep.cpp
View File

@ -33,6 +33,7 @@ void cSheep::GetDrops(cItems & a_Drops, cEntity * a_Killer)
void cSheep::OnRightClicked(cPlayer & a_Player) void cSheep::OnRightClicked(cPlayer & a_Player)
{ {
if ((a_Player.GetEquippedItem().m_ItemType == E_ITEM_SHEARS) && (!m_IsSheared)) if ((a_Player.GetEquippedItem().m_ItemType == E_ITEM_SHEARS) && (!m_IsSheared))
@ -46,7 +47,8 @@ void cSheep::OnRightClicked(cPlayer & a_Player)
} }
cItems Drops; cItems Drops;
Drops.push_back(cItem(E_BLOCK_WOOL, 4, m_WoolColor)); int NumDrops = m_World->GetTickRandomNumber(2) + 1;
Drops.push_back(cItem(E_BLOCK_WOOL, NumDrops, m_WoolColor));
m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10);
} }
} }
@ -54,3 +56,4 @@ void cSheep::OnRightClicked(cPlayer & a_Player)