diff options
author | madmaxoft <github@xoft.cz> | 2014-07-15 09:01:32 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-07-15 09:01:32 +0200 |
commit | 8e946da8ac109a8bedf9d243251f9a18d29e5a1a (patch) | |
tree | 30f046ddec20d809e3fa84e78b76f31915a361c2 /src/Blocks/BlockPiston.cpp | |
parent | ItemHandler.cpp: removed redundant food and drink checks (diff) | |
parent | Pass cItem by reference. (diff) | |
download | cuberite-8e946da8ac109a8bedf9d243251f9a18d29e5a1a.tar cuberite-8e946da8ac109a8bedf9d243251f9a18d29e5a1a.tar.gz cuberite-8e946da8ac109a8bedf9d243251f9a18d29e5a1a.tar.bz2 cuberite-8e946da8ac109a8bedf9d243251f9a18d29e5a1a.tar.lz cuberite-8e946da8ac109a8bedf9d243251f9a18d29e5a1a.tar.xz cuberite-8e946da8ac109a8bedf9d243251f9a18d29e5a1a.tar.zst cuberite-8e946da8ac109a8bedf9d243251f9a18d29e5a1a.zip |
Diffstat (limited to 'src/Blocks/BlockPiston.cpp')
-rw-r--r-- | src/Blocks/BlockPiston.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp index faf639312..ec480aaea 100644 --- a/src/Blocks/BlockPiston.cpp +++ b/src/Blocks/BlockPiston.cpp @@ -85,7 +85,7 @@ int cBlockPistonHandler::FirstPassthroughBlock(int a_PistonX, int a_PistonY, int NIBBLETYPE currMeta; AddPistonDir(a_PistonX, a_PistonY, a_PistonZ, pistonmeta, 1); a_World->GetBlockTypeMeta(a_PistonX, a_PistonY, a_PistonZ, currBlock, currMeta); - if (CanBreakPush(currBlock)) + if (cBlockInfo::IsPistonBreakable(currBlock)) { // This block breaks when pushed, extend up to here return ret; @@ -124,7 +124,7 @@ void cBlockPistonHandler::ExtendPiston(int a_BlockX, int a_BlockY, int a_BlockZ, } a_World->BroadcastBlockAction(a_BlockX, a_BlockY, a_BlockZ, 0, pistonMeta, pistonBlock); - a_World->BroadcastSoundEffect("tile.piston.out", a_BlockX * 8, a_BlockY * 8, a_BlockZ * 8, 0.5f, 0.7f); + a_World->BroadcastSoundEffect("tile.piston.out", (double)a_BlockX, (double)a_BlockY, (double)a_BlockZ, 0.5f, 0.7f); // Drop the breakable block in the line, if appropriate: AddPistonDir(a_BlockX, a_BlockY, a_BlockZ, pistonMeta, dist + 1); // "a_Block" now at the breakable / empty block @@ -198,7 +198,7 @@ void cBlockPistonHandler::RetractPiston(int a_BlockX, int a_BlockY, int a_BlockZ AddPistonDir(a_BlockX, a_BlockY, a_BlockZ, pistonMeta, -1); a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, pistonBlock, pistonMeta & ~(8)); a_World->BroadcastBlockAction(a_BlockX, a_BlockY, a_BlockZ, 1, pistonMeta & ~(8), pistonBlock); - a_World->BroadcastSoundEffect("tile.piston.in", a_BlockX * 8, a_BlockY * 8, a_BlockZ * 8, 0.5f, 0.7f); + a_World->BroadcastSoundEffect("tile.piston.in", (double)a_BlockX, (double)a_BlockY, (double)a_BlockZ, 0.5f, 0.7f); AddPistonDir(a_BlockX, a_BlockY, a_BlockZ, pistonMeta, 1); // Retract the extension, pull block if appropriate |