diff options
author | Safwat Halaby <SafwatHalaby@users.noreply.github.com> | 2015-12-13 13:43:53 +0100 |
---|---|---|
committer | Safwat Halaby <SafwatHalaby@users.noreply.github.com> | 2015-12-13 13:43:53 +0100 |
commit | 417a646d7d32c05d837451de9ae64cbcdc53a782 (patch) | |
tree | cf8f3e6ed33c7dc5e98baa6a530683749ae40e51 /src/BlockEntities/MobSpawnerEntity.cpp | |
parent | Merge pull request #2737 from Gargaj/snowgolem (diff) | |
parent | allow use failures to propagate from the entity/block to the player (diff) | |
download | cuberite-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/MobSpawnerEntity.cpp')
-rw-r--r-- | src/BlockEntities/MobSpawnerEntity.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/BlockEntities/MobSpawnerEntity.cpp b/src/BlockEntities/MobSpawnerEntity.cpp index 4418dca15..7f1b88c9b 100644 --- a/src/BlockEntities/MobSpawnerEntity.cpp +++ b/src/BlockEntities/MobSpawnerEntity.cpp @@ -33,14 +33,14 @@ void cMobSpawnerEntity::SendTo(cClientHandle & a_Client) -void cMobSpawnerEntity::UsedBy(cPlayer * a_Player) +bool cMobSpawnerEntity::UsedBy(cPlayer * a_Player) { if (a_Player->GetEquippedItem().m_ItemType == E_ITEM_SPAWN_EGG) { eMonsterType MonsterType = cItemSpawnEggHandler::ItemDamageToMonsterType(a_Player->GetEquippedItem().m_ItemDamage); if (MonsterType == eMonsterType::mtInvalidType) { - return; + return false; } m_Entity = MonsterType; @@ -50,7 +50,9 @@ void cMobSpawnerEntity::UsedBy(cPlayer * a_Player) a_Player->GetInventory().RemoveOneEquippedItem(); } LOGD("Changed monster spawner at {%d, %d, %d} to type %s.", GetPosX(), GetPosY(), GetPosZ(), cMonster::MobTypeToString(MonsterType).c_str()); + return true; } + return false; } |