Fix tripwire update

Lumine1909 · Sep 15, 2024 · 23a3012 · 23a3012
1 parent 1c05ade
commit 23a3012
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/patches/server/0017-Fix-tripwire-update.patch b/patches/server/0017-Fix-tripwire-update.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix tripwire update
 
 
 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 0f6ea0adb4b99d934e1a3fcb92562dffb2a45f63..b2f6712273de8169d2b8af01a48cd04f977d6ed0 100644
+index 0f6ea0adb4b99d934e1a3fcb92562dffb2a45f63..03cbf916cd3af404b2f234cfa15779b8eb7acf38 100644
 --- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
 @@ -162,7 +162,7 @@ public class TripWireHookBlock extends Block {
@@ -17,3 +17,12 @@ index 0f6ea0adb4b99d934e1a3fcb92562dffb2a45f63..b2f6712273de8169d2b8af01a48cd04f
                      aiblockdata[k] = iblockdata2;
                      if (k == i) {
                          world.scheduleTick(pos, block, 10);
+@@ -195,7 +195,7 @@ public class TripWireHookBlock extends Block {
+
+             TripWireHookBlock.emitState(world, pos, flag4, flag5, flag2, flag3);
+             if (!beingRemoved) { // Paper - fix tripwire state inconsistency
+-                if (world.getBlockState(pos).getBlock() == Blocks.TRIPWIRE_HOOK) // Paper - validate
++                // if (world.getBlockState(pos).getBlock() == Blocks.TRIPWIRE_HOOK) // Paper - validate - Leaves - vanilla
+                 world.setBlock(pos, (BlockState) iblockdata3.setValue(TripWireHookBlock.FACING, enumdirection), 3);
+                 if (flag1) {
+                     TripWireHookBlock.notifyNeighbors(block, world, pos, enumdirection);