mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
34 lines
2.0 KiB
Diff
34 lines
2.0 KiB
Diff
From cb226719b349208513caaaca05399da238d102b9 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Fri, 12 Jun 2020 16:15:12 -0500
|
|
Subject: [PATCH] PaperPR - Fix more exploits (carpet dupe, rail dupe, bedrock
|
|
destroying, falling block (sand/dragon egg/etc) duping)
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/BlockPiston.java | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
|
|
index 9cca30a94f..3bd3a1fe84 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockPiston.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockPiston.java
|
|
@@ -373,11 +373,13 @@ public class BlockPiston extends BlockDirectional {
|
|
}
|
|
|
|
for (k = list.size() - 1; k >= 0; --k) {
|
|
- blockposition3 = (BlockPosition) list.get(k);
|
|
- iblockdata1 = world.getType(blockposition3); map.replace(blockposition3, iblockdata1); // Paper - fix piston physics inconsistency
|
|
+ BlockPosition oldPos = blockposition3 = (BlockPosition) list.get(k); // Purpur
|
|
+ iblockdata1 = null; // Purpur - explode if usage changes
|
|
blockposition3 = blockposition3.shift(enumdirection1);
|
|
map.remove(blockposition3);
|
|
world.setTypeAndData(blockposition3, (IBlockData) Blocks.MOVING_PISTON.getBlockData().set(BlockPiston.FACING, enumdirection), 68);
|
|
+ iblockdata1 = world.getType(oldPos); map.replace(oldPos, iblockdata1); // Purpur - fix piston physics inconsistency - move after the physics update
|
|
+ world.setTypeAndData(oldPos, Blocks.AIR.getBlockData(), 68); // Purpur - set air to prevent later physics updates from seeing this block
|
|
world.setTileEntity(blockposition3, BlockPistonMoving.a(iblockdata1, enumdirection, flag, false)); // Paper - fix piston physics inconsistency
|
|
--j;
|
|
aiblockdata[j] = iblockdata1;
|
|
--
|
|
2.26.2
|
|
|