SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add unsupported-settings section to config (piston tnt dupe config option) (#3565)

Browse Source
This commit is contained in:
Josh Roy
2020-06-15 12:29:39 -04:00
parent 454eaca2d3
commit c5b5820901
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Spigot-Server-Patches/Fix-piston-physics-inconsistency-MC-188840.patch
View File

@@ -25,6 +25,19 @@ unaffected.
This patch fixes https://bugs.mojang.com/browse/MC-188840 This patch fixes https://bugs.mojang.com/browse/MC-188840
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {
consoleHasAllPermissions = getBoolean("settings.console-has-all-permissions", consoleHasAllPermissions);
}
+ public static boolean allowTntDuplication = false;
+ private static void allowTntDuplication() {
+ allowTntDuplication = getBoolean("settings.unsupported-settings.allow-tnt-duplication", allowTntDuplication);
+ }
}
diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/BlockPiston.java --- a/src/main/java/net/minecraft/server/BlockPiston.java
@@ -34,12 +47,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
for (k = list.size() - 1; k >= 0; --k) { for (k = list.size() - 1; k >= 0; --k) {
blockposition3 = (BlockPosition) list.get(k); blockposition3 = (BlockPosition) list.get(k);
- iblockdata1 = world.getType(blockposition3); - iblockdata1 = world.getType(blockposition3);
+ iblockdata1 = world.getType(blockposition3); map.replace(blockposition3, iblockdata1); // Paper - fix piston physics inconsistency + iblockdata1 = world.getType(blockposition3); if (!com.destroystokyo.paper.PaperConfig.allowTntDuplication) map.replace(blockposition3, iblockdata1); // Paper start - fix piston physics inconsistency
blockposition3 = blockposition3.shift(enumdirection1); blockposition3 = blockposition3.shift(enumdirection1);
map.remove(blockposition3); map.remove(blockposition3);
world.setTypeAndData(blockposition3, (IBlockData) Blocks.MOVING_PISTON.getBlockData().set(BlockPiston.FACING, enumdirection), 68); 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((IBlockData) list1.get(k), enumdirection, flag, false));
+ world.setTileEntity(blockposition3, BlockPistonMoving.a(iblockdata1, enumdirection, flag, false)); // Paper - fix piston physics inconsistency + world.setTileEntity(blockposition3, BlockPistonMoving.a(com.destroystokyo.paper.PaperConfig.allowTntDuplication ? list1.get(k) : iblockdata1, enumdirection, flag, false)); // Paper - fix piston physics inconsistency
--j; --j;
aiblockdata[j] = iblockdata1; aiblockdata[j] = iblockdata1;
} }
@@ -52,7 +65,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
if (iblockdata.isAir()) { if (iblockdata.isAir()) {
- this.world.setTypeAndData(this.position, this.a, 84); - 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 + this.world.setTypeAndData(this.position, this.a, 84 | (com.destroystokyo.paper.PaperConfig.allowTntDuplication ? 0 : 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); Block.a(this.a, iblockdata, this.world, this.position, 3);
} else { } else {
if (iblockdata.b((IBlockState) BlockProperties.C) && (Boolean) iblockdata.get(BlockProperties.C)) { if (iblockdata.b((IBlockState) BlockProperties.C) && (Boolean) iblockdata.get(BlockProperties.C)) {