Add back configurable tripwire dupe

Winds-Studio · Feb 24, 2025 · be4bee9 · be4bee9
1 parent ab0e8da
commit be4bee9
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 4 deletions.
diff --git a/...ver/0108-Configurable-tripwire-dupe.patch → ...res/0109-Configurable-tripwire-dupe.patch b/...ver/0108-Configurable-tripwire-dupe.patch → ...res/0109-Configurable-tripwire-dupe.patch
@@ -3,12 +3,13 @@ From: Dreeam <[email protected]>
 Date: Tue, 24 Dec 2024 13:28:56 -0500
 Subject: [PATCH] Configurable tripwire dupe
 
-Removed since Paper 1.21.4
-
 Bring back MC-59471, MC-129055 on 1.21.2+, which fixed in 1.21.2 snapshots 24w33a and 24w36a
 
+Note: this is different from Paper's skip-tripwire-hook-placement-validation, that setting
+handles tripwire hook dupe
+
 diff --git a/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java
-index 6a7e5a642e2eaf7d5dffadb81738f7385a38c0af..fa7e2c5406bb4bb755fb6e215dda5fe704b6bdf4 100644
+index 9aace993c6c18f1a50610e4766225485984b8167..d62855ce6df9a52cdd8005a43a70353365a92230 100644
 --- a/net/minecraft/world/level/block/TripWireHookBlock.java
 +++ b/net/minecraft/world/level/block/TripWireHookBlock.java
 @@ -215,7 +215,7 @@ public class TripWireHookBlock extends Block {
@@ -17,6 +18,6 @@ index 6a7e5a642e2eaf7d5dffadb81738f7385a38c0af..fa7e2c5406bb4bb755fb6e215dda5fe7
                          BlockState blockState3 = level.getBlockState(blockPos1);
 -                        if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
 +                        if (org.dreeam.leaf.config.modules.gameplay.ConfigurableTripWireDupe.enabled || blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) { // Leaf - Configurable tripwire dupe
-                             level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3);
+                             if (!io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates || !blockState3.is(Blocks.TRIPWIRE)) level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3); // Paper - prevent tripwire from updating
                          }
                      }
diff --git a/...7075-Block-Entities-Unload-Lag-Spik.patch → ...7075-Block-Entities-Unload-Lag-Spik.patch b/...7075-Block-Entities-Unload-Lag-Spik.patch → ...7075-Block-Entities-Unload-Lag-Spik.patch
diff --git a/...Rearrange-the-attackable-conditions.patch → ...Rearrange-the-attackable-conditions.patch b/...Rearrange-the-attackable-conditions.patch → ...Rearrange-the-attackable-conditions.patch
diff --git a/...-dirty-stats-copy-when-requesting-p.patch → ...-dirty-stats-copy-when-requesting-p.patch b/...-dirty-stats-copy-when-requesting-p.patch → ...-dirty-stats-copy-when-requesting-p.patch
diff --git a/...t-dirty-flag-when-loading-maps-from.patch → ...t-dirty-flag-when-loading-maps-from.patch b/...t-dirty-flag-when-loading-maps-from.patch → ...t-dirty-flag-when-loading-maps-from.patch
diff --git a/...hecking-nearby-players-for-spawning.patch → ...hecking-nearby-players-for-spawning.patch b/...hecking-nearby-players-for-spawning.patch → ...hecking-nearby-players-for-spawning.patch
diff --git a/...s/0114-Cache-supporting-block-check.patch → ...s/0115-Cache-supporting-block-check.patch b/...s/0114-Cache-supporting-block-check.patch → ...s/0115-Cache-supporting-block-check.patch
diff --git a/...ue-clear-on-LevelTicks-cleanupAfter.patch → ...ue-clear-on-LevelTicks-cleanupAfter.patch b/...ue-clear-on-LevelTicks-cleanupAfter.patch → ...ue-clear-on-LevelTicks-cleanupAfter.patch
diff --git a/...ivity-maps-with-optimized-collectio.patch → ...ivity-maps-with-optimized-collectio.patch b/...ivity-maps-with-optimized-collectio.patch → ...ivity-maps-with-optimized-collectio.patch
diff --git a/...res/0117-Remove-stream-in-villagers.patch → ...res/0118-Remove-stream-in-villagers.patch b/...res/0117-Remove-stream-in-villagers.patch → ...res/0118-Remove-stream-in-villagers.patch
diff --git a/.../0118-Optimize-baby-villager-sensor.patch → .../0119-Optimize-baby-villager-sensor.patch b/.../0118-Optimize-baby-villager-sensor.patch → .../0119-Optimize-baby-villager-sensor.patch
diff --git a/.../features/0119-Only-player-pushable.patch → .../features/0120-Only-player-pushable.patch b/.../features/0119-Only-player-pushable.patch → .../features/0120-Only-player-pushable.patch
diff --git a/...e-iterators-from-Inventory-contains.patch → ...e-iterators-from-Inventory-contains.patch b/...e-iterators-from-Inventory-contains.patch → ...e-iterators-from-Inventory-contains.patch
diff --git a/...es/0121-Alternative-Brain-Behaviour.patch → ...es/0122-Alternative-Brain-Behaviour.patch b/...es/0121-Alternative-Brain-Behaviour.patch → ...es/0122-Alternative-Brain-Behaviour.patch
diff --git a/...eligible-players-for-despawn-checks.patch → ...eligible-players-for-despawn-checks.patch b/...eligible-players-for-despawn-checks.patch → ...eligible-players-for-despawn-checks.patch
diff --git a/...-Slightly-optimise-getNearestPlayer.patch → ...-Slightly-optimise-getNearestPlayer.patch b/...-Slightly-optimise-getNearestPlayer.patch → ...-Slightly-optimise-getNearestPlayer.patch