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

allow use failures to propagate from the entity/block to the player

Browse Source
This commit is contained in:
Gargaj
2015-12-01 23:12:44 +01:00
parent e7fd308ffa
commit f9008a4860
55 changed files with 120 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/BlockEntities/JukeboxEntity.cpp
View File

@@ -28,11 +28,12 @@ cJukeboxEntity::~cJukeboxEntity()
void cJukeboxEntity::UsedBy(cPlayer * a_Player)
bool cJukeboxEntity::UsedBy(cPlayer * a_Player)
{
if (IsPlayingRecord())
{
EjectRecord();
return true;
}
else
{
@@ -40,8 +41,10 @@ void cJukeboxEntity::UsedBy(cPlayer * a_Player)
if (PlayRecord(HeldItem.m_ItemType))
{
a_Player->GetInventory().RemoveOneEquippedItem();
return true;
}
}
return false;
}