diff options
| author | DungeonDev <[email protected]> | 2024-04-02 12:15:49 +0200 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-04-02 12:18:22 +0200 |
| commit | e709245b5566229ed5c262b310bcd1a1e71a8918 (patch) | |
| tree | afe26ed2bf5c4995fec066dbc4f856622d4b8222 /patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch | |
| parent | 45d1486fecab6f50c193bea0fcf03727832f3091 (diff) | |
| download | Paper-e709245b5566229ed5c262b310bcd1a1e71a8918.tar.gz Paper-e709245b5566229ed5c262b310bcd1a1e71a8918.zip | |
Add config option for tripwire disarming fix
Fixes #10382
Co-authored-by: Tamion <[email protected]>
Diffstat (limited to 'patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch')
| -rw-r--r-- | patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch index efe071cf68..46a8a52189 100644 --- a/patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch +++ b/patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch @@ -6,14 +6,14 @@ 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 d9b3877257b31ca1b5acc4a47fbf5b993de69ae0..8bf94fcf5c46ffe6d90f8431338b768ef1a2dd61 100644 +index d9b3877257b31ca1b5acc4a47fbf5b993de69ae0..efd8d77a441fd334ea4c09c5e31c6d946c1ae0b7 100644 --- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java @@ -201,9 +201,8 @@ public class TripWireHookBlock extends Block { BlockState iblockdata4 = aiblockdata[l]; if (iblockdata4 != null) { -+ if (world.getBlockState(blockposition2).is(Blocks.TRIPWIRE)) { // Paper - Fix tripwire disarming not working as intended ++ 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()) { - ; |