dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
23 Zeilen
1.3 KiB
Diff
23 Zeilen
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: DungeonDev <dungeondevtn@gmail.com>
|
|
Date: Sun, 2 Jul 2023 02:34:54 +0100
|
|
Subject: [PATCH] Fix tripwire disarming not working as intended
|
|
|
|
Fixes MC-129055
|
|
|
|
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 8614fad5b3df7a6030384b108b1689bf6b9f1209..76aca266d3f3222502ff4c196228f08fcd88c5f8 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
|
|
@@ -202,9 +202,8 @@ public class TripWireHookBlock extends Block {
|
|
BlockState iblockdata4 = aiblockdata[l];
|
|
|
|
if (iblockdata4 != null) {
|
|
+ if (world.getBlockState(blockposition2).is(Blocks.TRIPWIRE) || io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowTripwireDisarmingExploits) { // Paper - Fix tripwire disarming not working as intended
|
|
world.setBlock(blockposition2, (BlockState) iblockdata4.trySetValue(TripWireHookBlock.ATTACHED, flag4), 3);
|
|
- if (!world.getBlockState(blockposition2).isAir()) {
|
|
- ;
|
|
}
|
|
}
|
|
}
|