From c54f9cede236b16bb54bd5fb3b82c62791b0d2c7 Mon Sep 17 00:00:00 2001 From: Altenius Date: Tue, 5 Jul 2016 19:21:53 -0400 Subject: [PATCH] Fixed piston destroying other pistons Fixes #3251 --- src/Blocks/BlockPiston.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp index 1da2a61ec..3bed01cc1 100644 --- a/src/Blocks/BlockPiston.cpp +++ b/src/Blocks/BlockPiston.cpp @@ -32,13 +32,17 @@ void cBlockPistonHandler::OnDestroyed(cChunkInterface & a_ChunkInterface, cWorld { Vector3i blockPos(a_BlockX, a_BlockY, a_BlockZ); - // Get the extension of the piston NIBBLETYPE OldMeta = a_ChunkInterface.GetBlockMeta(blockPos.x, blockPos.y, blockPos.z); - blockPos += MetadataToOffset(OldMeta); - - if (a_ChunkInterface.GetBlock(blockPos) == E_BLOCK_PISTON_EXTENSION) + // If the piston is extended, destroy the extension as well + if (IsExtended(OldMeta)) { - a_ChunkInterface.SetBlock(blockPos.x, blockPos.y, blockPos.z, E_BLOCK_AIR, 0); + // Get the position of the extension + blockPos += MetadataToOffset(OldMeta); + + if (a_ChunkInterface.GetBlock(blockPos) == E_BLOCK_PISTON_EXTENSION) + { + a_ChunkInterface.SetBlock(blockPos.x, blockPos.y, blockPos.z, E_BLOCK_AIR, 0); + } } }