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/Blocks/BlockButton.h | |
| 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 '')
| -rw-r--r-- | src/Blocks/BlockButton.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h index c24945ea8..7f6c3e56f 100644 --- a/src/Blocks/BlockButton.h +++ b/src/Blocks/BlockButton.h @@ -16,7 +16,7 @@ public: { } - 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 { NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); @@ -27,7 +27,7 @@ public: // If button is already on do nothing if (Meta & 0x08) { - return; + return false; } // Set p the ON bit to on @@ -46,7 +46,8 @@ public: { a_World.BroadcastSoundEffect("random.click", x, y, z, 0.5f, 0.5f); }); - + + return true; } virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override |