summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockTrapdoor.h
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/Blocks/BlockTrapdoor.h
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/Blocks/BlockTrapdoor.h')
-rw-r--r--src/Blocks/BlockTrapdoor.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Blocks/BlockTrapdoor.h b/src/Blocks/BlockTrapdoor.h
index 4c5cb410b..bd10a63da 100644
--- a/src/Blocks/BlockTrapdoor.h
+++ b/src/Blocks/BlockTrapdoor.h
@@ -28,12 +28,12 @@ public:
return true;
}
- virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
+ virtual bool OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
{
if (m_BlockType == E_BLOCK_IRON_TRAPDOOR)
{
// Iron doors can only be toggled by redstone, not by right-clicking
- return;
+ return false;
}
// Flip the ON bit on / off using the XOR bitwise operation
@@ -42,6 +42,8 @@ public:
cWorld * World = static_cast<cWorld *>(&a_WorldInterface);
World->BroadcastSoundParticleEffect(EffectID::SFX_RANDOM_DOOR_OPEN_CLOSE, a_BlockX, a_BlockY, a_BlockZ, 0, a_Player->GetClientHandle());
+
+ return true;
}
virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override