diff --git a/patches/server/Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/Fix-tripwire-disarming-not-working-as-intended.patch index b3470ed5c..cb574fcf8 100644 --- a/patches/server/Fix-tripwire-disarming-not-working-as-intended.patch +++ b/patches/server/Fix-tripwire-disarming-not-working-as-intended.patch @@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 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()) { - ; diff --git a/patches/server/Paper-config-files.patch b/patches/server/Paper-config-files.patch index b67772b44..a3653ddf3 100644 --- a/patches/server/Paper-config-files.patch +++ b/patches/server/Paper-config-files.patch @@ -635,6 +635,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + public UnsupportedSettings unsupportedSettings; + + public class UnsupportedSettings extends ConfigurationPart { ++ @Comment("This setting controls if the broken behavior of disarmed tripwires not breaking should be allowed. This also allows for dupes") ++ public boolean allowTripwireDisarmingExploits = false; + @Comment("This setting allows for exploits related to end portals, for example sand duping") + public boolean allowUnsafeEndPortalTeleportation = false; + @Comment("This setting controls if players should be able to break bedrock, end portals and other intended to be permanent blocks.")