summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities/JukeboxEntity.cpp
diff options
context:
space:
mode:
authorSafwat Halaby <SafwatHalaby@users.noreply.github.com>2015-12-13 13:43:53 +0100
committerSafwat Halaby <SafwatHalaby@users.noreply.github.com>2015-12-13 13:43:53 +0100
commit417a646d7d32c05d837451de9ae64cbcdc53a782 (patch)
treecf8f3e6ed33c7dc5e98baa6a530683749ae40e51 /src/BlockEntities/JukeboxEntity.cpp
parentMerge pull request #2737 from Gargaj/snowgolem (diff)
parentallow use failures to propagate from the entity/block to the player (diff)
downloadcuberite-417a646d7d32c05d837451de9ae64cbcdc53a782.tar
cuberite-417a646d7d32c05d837451de9ae64cbcdc53a782.tar.gz
cuberite-417a646d7d32c05d837451de9ae64cbcdc53a782.tar.bz2
cuberite-417a646d7d32c05d837451de9ae64cbcdc53a782.tar.lz
cuberite-417a646d7d32c05d837451de9ae64cbcdc53a782.tar.xz
cuberite-417a646d7d32c05d837451de9ae64cbcdc53a782.tar.zst
cuberite-417a646d7d32c05d837451de9ae64cbcdc53a782.zip
Diffstat (limited to 'src/BlockEntities/JukeboxEntity.cpp')
-rw-r--r--src/BlockEntities/JukeboxEntity.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp
index 1f3f4f324..467a3a28a 100644
--- a/src/BlockEntities/JukeboxEntity.cpp
+++ b/src/BlockEntities/JukeboxEntity.cpp
@@ -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;
}