diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-11-21 23:44:18 +0100 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-11-21 23:44:18 +0100 |
commit | 314884d9bbd5ec1edf0ec473a1c29b493964f955 (patch) | |
tree | 630ff13b87592467ff509a55ce694768f6c8779d /source/Blocks/BlockButton.cpp | |
parent | Multiple bugfixes [SEE DESC] (diff) | |
download | cuberite-314884d9bbd5ec1edf0ec473a1c29b493964f955.tar cuberite-314884d9bbd5ec1edf0ec473a1c29b493964f955.tar.gz cuberite-314884d9bbd5ec1edf0ec473a1c29b493964f955.tar.bz2 cuberite-314884d9bbd5ec1edf0ec473a1c29b493964f955.tar.lz cuberite-314884d9bbd5ec1edf0ec473a1c29b493964f955.tar.xz cuberite-314884d9bbd5ec1edf0ec473a1c29b493964f955.tar.zst cuberite-314884d9bbd5ec1edf0ec473a1c29b493964f955.zip |
Diffstat (limited to 'source/Blocks/BlockButton.cpp')
-rw-r--r-- | source/Blocks/BlockButton.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/Blocks/BlockButton.cpp b/source/Blocks/BlockButton.cpp index 19b055b62..a48e82f4d 100644 --- a/source/Blocks/BlockButton.cpp +++ b/source/Blocks/BlockButton.cpp @@ -18,13 +18,13 @@ cBlockButtonHandler::cBlockButtonHandler(BLOCKTYPE a_BlockType) void cBlockButtonHandler::OnUse(cWorld *a_World, cPlayer *a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) { // Flip the ON bit on/off using the XOR bitwise operation - NIBBLETYPE Meta = ((a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) ^ 0x08) & 0x0f); + NIBBLETYPE Meta = (a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) | 0x08); a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, m_BlockType, Meta); a_World->BroadcastSoundEffect("random.click", a_BlockX * 8, a_BlockY * 8, a_BlockZ * 8, 0.5f, (Meta & 0x08) ? 0.6f : 0.5f); // Queue a button reset (unpress) - a_World->QueueSetBlock(a_BlockX, a_BlockY, a_BlockZ, m_BlockType, ((a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) ^ 0x08) & 0x0f), m_BlockType == E_BLOCK_STONE_BUTTON ? 20 : 30); + a_World->QueueSetBlock(a_BlockX, a_BlockY, a_BlockZ, m_BlockType, (a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) & 0x07), m_BlockType == E_BLOCK_STONE_BUTTON ? 20 : 30); } |