From 41e09484b78da4882dae770e52f98570271d5054 Mon Sep 17 00:00:00 2001 From: Mat Date: Sun, 22 Mar 2020 22:51:11 +0200 Subject: Don't push blocks outside world height limits (#4516) * Don't push blocks outside world height limits * Style fix * Apply suggestion Co-Authored-By: peterbell10 * Apply suggestion Co-Authored-By: peterbell10 * Improvements * Add block type check back * Revert line break changes * Update BlockPiston.cpp Co-authored-by: peterbell10 --- src/Blocks/BlockPiston.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp index 6ebbd784d..5c929c4c5 100644 --- a/src/Blocks/BlockPiston.cpp +++ b/src/Blocks/BlockPiston.cpp @@ -142,6 +142,11 @@ bool cBlockPistonHandler::CanPushBlock( NIBBLETYPE currMeta; a_World.GetBlockTypeMeta(a_BlockPos.x, a_BlockPos.y, a_BlockPos.z, currBlock, currMeta); + if (!cChunkDef::IsValidHeight(a_BlockPos.y)) + { + return !a_RequirePushable; + } + if (currBlock == E_BLOCK_AIR) { // Air can be pushed -- cgit v1.2.3