diff --git a/patches/server/0013-Remove-Paper-s-Fix-tripwire-state-inconsistency.patch b/patches/server/0013-Remove-Paper-s-Fix-tripwire-dupe.patch similarity index 83% rename from patches/server/0013-Remove-Paper-s-Fix-tripwire-state-inconsistency.patch rename to patches/server/0013-Remove-Paper-s-Fix-tripwire-dupe.patch index 0233f2f4..73220bac 100644 --- a/patches/server/0013-Remove-Paper-s-Fix-tripwire-state-inconsistency.patch +++ b/patches/server/0013-Remove-Paper-s-Fix-tripwire-dupe.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sun, 6 Nov 2022 04:32:27 -0500 -Subject: [PATCH] Remove Paper's Fix tripwire state inconsistency +Subject: [PATCH] Remove Paper's Fix tripwire dupe +Revert Paper's Fix tripwire state inconsistency patches: +Fix-tripwire-state-inconsistency.patch +Validate-tripwire-hook-placement-before-update.patch diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java index 7f60175bf671d282c11e9084670d2bb900968255..4e2fb4ee8e46b3c363992ff23e26f5a648c5f003 100644 @@ -40,7 +43,7 @@ index 7f60175bf671d282c11e9084670d2bb900968255..4e2fb4ee8e46b3c363992ff23e26f5a6 } else if (iblockdata1.is((Block) this)) { ++k; diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java -index 004dce26ff073f1de52a84cd425c4f60fdab5e50..4a516828e5c6abd63511ee7c93fcff11203cf8d0 100644 +index 004dce26ff073f1de52a84cd425c4f60fdab5e50..a5f8c7d9d9998eebce7f15e01c157651b9831516 100644 --- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java @@ -108,12 +108,6 @@ public class TripWireHookBlock extends Block { @@ -64,3 +67,11 @@ index 004dce26ff073f1de52a84cd425c4f60fdab5e50..4a516828e5c6abd63511ee7c93fcff11 aiblockdata[k] = iblockdata2; if (k == i) { world.scheduleTick(pos, (Block) this, 10); +@@ -182,7 +175,6 @@ public class TripWireHookBlock extends Block { + + this.emitState(world, pos, flag4, flag5, flag2, flag3); + if (!beingRemoved) { +- if (world.getBlockState(pos).getBlock() == Blocks.TRIPWIRE_HOOK) // Paper - validate + world.setBlock(pos, (BlockState) iblockdata3.setValue(TripWireHookBlock.FACING, enumdirection), 3); + if (flag1) { + this.notifyNeighbors(world, pos, enumdirection);