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

Merge pull request #1305 from mc-server/Food

Browse Source 
Fixed swing arm animation when you ate.
This commit is contained in:
Mattes D 2014-08-10 19:36:29 +02:00
commit 9469256cac
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entities/Player.cpp
View File

@ -601,7 +601,6 @@ void cPlayer::FinishEating(void)
// Send the packets: // Send the packets:
m_ClientHandle->SendEntityStatus(*this, esPlayerEatingAccepted); m_ClientHandle->SendEntityStatus(*this, esPlayerEatingAccepted);
m_World->BroadcastEntityAnimation(*this, 0);
m_World->BroadcastEntityMetadata(*this); m_World->BroadcastEntityMetadata(*this);
// consume the item: // consume the item:
@ -619,8 +618,8 @@ void cPlayer::FinishEating(void)
// if the food is mushroom soup, return a bowl to the inventory // if the food is mushroom soup, return a bowl to the inventory
if (Item.m_ItemType == E_ITEM_MUSHROOM_SOUP) if (Item.m_ItemType == E_ITEM_MUSHROOM_SOUP)
{ {
cItem emptyBowl(E_ITEM_BOWL, 1, 0, ""); cItem EmptyBowl(E_ITEM_BOWL);
GetInventory().AddItem(emptyBowl, true, true); GetInventory().AddItem(EmptyBowl, true, true);
} }
} }
@ -631,7 +630,6 @@ void cPlayer::FinishEating(void)
void cPlayer::AbortEating(void) void cPlayer::AbortEating(void)
{ {
m_EatingFinishTick = -1; m_EatingFinishTick = -1;
m_World->BroadcastEntityAnimation(*this, 0);
m_World->BroadcastEntityMetadata(*this); m_World->BroadcastEntityMetadata(*this);
} }