From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Thu, 11 Jun 2020 17:29:42 -0700 Subject: [PATCH] Fix piston physics inconsistency - MC-188840 Pistons invoke physics when they move blocks. The physics can cause tnt blocks to ignite. However, pistons (when storing the blocks they "moved") don't actually go back to the world state sometimes to check if something like that happened. As a result they end up moving the tnt like it was never ignited. This resulted in the ability to create machines that can duplicate tnt, called "world eaters". This patch makes the piston logic retrieve the block state from the world prevent this from occuring. Tested against the following tnt duper design: https://www.youtube.com/watch?v=mS7xxNGhjxs This patch also affects every type of machine that utilises this mechanic. For example, dead coral is removed by a physics update when being moved while it is attached to slimeblocks. Standard piston machines that don't destroy or modify the blocks they move by physics updates should be entirely unaffected. This patch fixes https://bugs.mojang.com/browse/MC-188840 diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java index b29525c40dc8e3ae747b8ddf5a3bd79b7cc0b792..880aa8c86d1724cd9ef68e0abfff8bb38f389462 100644 --- a/src/main/java/net/minecraft/server/BlockPiston.java +++ b/src/main/java/net/minecraft/server/BlockPiston.java @@ -364,11 +364,11 @@ public class BlockPiston extends BlockDirectional { for (k = list.size() - 1; k >= 0; --k) { blockposition3 = (BlockPosition) list.get(k); - iblockdata1 = world.getType(blockposition3); + iblockdata1 = world.getType(blockposition3); map.replace(blockposition3, iblockdata1); // Paper - fix piston physics inconsistency blockposition3 = blockposition3.shift(enumdirection1); map.remove(blockposition3); world.setTypeAndData(blockposition3, (IBlockData) Blocks.MOVING_PISTON.getBlockData().set(BlockPiston.FACING, enumdirection), 68); - world.setTileEntity(blockposition3, BlockPistonMoving.a((IBlockData) list1.get(k), enumdirection, flag, false)); + world.setTileEntity(blockposition3, BlockPistonMoving.a(iblockdata1, enumdirection, flag, false)); // Paper - fix piston physics inconsistency --j; aiblockdata[j] = iblockdata1; } diff --git a/src/main/java/net/minecraft/server/TileEntityPiston.java b/src/main/java/net/minecraft/server/TileEntityPiston.java index 489175abd8e582a3c082364fec357c4f061a22d7..946522f6362638f518fba15172fb7f676d46b67c 100644 --- a/src/main/java/net/minecraft/server/TileEntityPiston.java +++ b/src/main/java/net/minecraft/server/TileEntityPiston.java @@ -275,7 +275,7 @@ public class TileEntityPiston extends TileEntity implements ITickable { IBlockData iblockdata = Block.b(this.a, (GeneratorAccess) this.world, this.position); if (iblockdata.isAir()) { - this.world.setTypeAndData(this.position, this.a, 84); + this.world.setTypeAndData(this.position, this.a, 84 | 2); // Paper - force notify (flag 2), it's possible the set type by the piston block (which doesn't notify) set this block to air Block.a(this.a, iblockdata, this.world, this.position, 3); } else { if (iblockdata.b((IBlockState) BlockProperties.C) && (Boolean) iblockdata.get(BlockProperties.C)) {