summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockButton.h
diff options
context:
space:
mode:
authorGargaj <gargaj@conspiracy.hu>2015-12-01 23:12:44 +0100
committerGargaj <gargaj@conspiracy.hu>2015-12-13 13:27:38 +0100
commitf9008a4860dc9af9ca2e2ceb643064745269dcec (patch)
treecf8f3e6ed33c7dc5e98baa6a530683749ae40e51 /src/Blocks/BlockButton.h
parentMerge pull request #2737 from Gargaj/snowgolem (diff)
downloadcuberite-f9008a4860dc9af9ca2e2ceb643064745269dcec.tar
cuberite-f9008a4860dc9af9ca2e2ceb643064745269dcec.tar.gz
cuberite-f9008a4860dc9af9ca2e2ceb643064745269dcec.tar.bz2
cuberite-f9008a4860dc9af9ca2e2ceb643064745269dcec.tar.lz
cuberite-f9008a4860dc9af9ca2e2ceb643064745269dcec.tar.xz
cuberite-f9008a4860dc9af9ca2e2ceb643064745269dcec.tar.zst
cuberite-f9008a4860dc9af9ca2e2ceb643064745269dcec.zip
Diffstat (limited to 'src/Blocks/BlockButton.h')
-rw-r--r--src/Blocks/BlockButton.h7
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