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

Merge branch 'master' into blocks

Browse Source 
Conflicts:
	src/Items/ItemHandler.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
This commit is contained in:
Masy98
2014-09-26 18:32:31 +02:00
parent ad1c61c3dd ad5d0eda9c
commit 2feee3b316
184 changed files with 12722 additions and 6557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mobs/Sheep.cpp
View File

@@ -54,6 +54,8 @@ void cSheep::GetDrops(cItems & a_Drops, cEntity * a_Killer)
void cSheep::OnRightClicked(cPlayer & a_Player)
{
super::OnRightClicked(a_Player);
const cItem & EquippedItem = a_Player.GetEquippedItem();
if ((EquippedItem.m_ItemType == E_ITEM_SHEARS) && !IsSheared() && !IsBaby())
{