diff options
| author | madmaxoft <github@xoft.cz> | 2013-08-09 16:20:12 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-08-09 16:20:12 +0200 |
| commit | f89d6cc9afdafe0092cf837084fffefe69e1b19a (patch) | |
| tree | 2779c2e13b2c2bd6fca2e5b13474ad45eaf6a76b /source/Blocks/BlockPiston.cpp | |
| parent | Fixed squid crashing the server when above or below the world (diff) | |
| download | cuberite-f89d6cc9afdafe0092cf837084fffefe69e1b19a.tar cuberite-f89d6cc9afdafe0092cf837084fffefe69e1b19a.tar.gz cuberite-f89d6cc9afdafe0092cf837084fffefe69e1b19a.tar.bz2 cuberite-f89d6cc9afdafe0092cf837084fffefe69e1b19a.tar.lz cuberite-f89d6cc9afdafe0092cf837084fffefe69e1b19a.tar.xz cuberite-f89d6cc9afdafe0092cf837084fffefe69e1b19a.tar.zst cuberite-f89d6cc9afdafe0092cf837084fffefe69e1b19a.zip | |
Diffstat (limited to 'source/Blocks/BlockPiston.cpp')
| -rw-r--r-- | source/Blocks/BlockPiston.cpp | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/source/Blocks/BlockPiston.cpp b/source/Blocks/BlockPiston.cpp index d0f90559e..1bfac3ca1 100644 --- a/source/Blocks/BlockPiston.cpp +++ b/source/Blocks/BlockPiston.cpp @@ -35,7 +35,7 @@ cBlockPistonHandler::cBlockPistonHandler(BLOCKTYPE a_BlockType) void cBlockPistonHandler::OnDestroyed(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) { - char OldMeta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); + NIBBLETYPE OldMeta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); int newX = a_BlockX; int newY = a_BlockY; @@ -67,3 +67,36 @@ bool cBlockPistonHandler::GetPlacementBlockTypeMeta( + +/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// cBlockPistonHeadHandler: + +cBlockPistonHeadHandler::cBlockPistonHeadHandler(void) : + super(E_BLOCK_PISTON_EXTENSION) +{ +} + + + + + +void cBlockPistonHeadHandler::OnDestroyedByPlayer(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) +{ + NIBBLETYPE OldMeta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); + + int newX = a_BlockX; + int newY = a_BlockY; + int newZ = a_BlockZ; + AddPistonDir(newX, newY, newZ, OldMeta & ~(8), -1); + + BLOCKTYPE Block = a_World->GetBlock(newX, newY, newZ); + if ((Block == E_BLOCK_STICKY_PISTON) || (Block == E_BLOCK_PISTON)) + { + a_World->DigBlock(newX, newY, newZ); + } +} + + + + + |