Check allow before getting block state while tripwire state updating

LuminolMC · Aug 6, 2024 · 98bbcd6 · 98bbcd6
1 parent 1ed71f5
commit 98bbcd6
Show file tree

Hide file tree

Showing 35 changed files with 20 additions and 0 deletions.
diff --git a/patches/server/0022-Check-allow-before-getting-block-state-while-tripwir.patch b/patches/server/0022-Check-allow-before-getting-block-state-while-tripwir.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <wangxyper@163.com>
+Date: Tue, 6 Aug 2024 21:06:31 +0800
+Subject: [PATCH] Check allow before getting block state while tripwire state
+ updating
+
+
+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 76aca266d3f3222502ff4c196228f08fcd88c5f8..82a6d0e3620aea26cd32296128488e13b6d43f44 100644
+--- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
+@@ -202,7 +202,7 @@ 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
++                        if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowTripwireDisarmingExploits || world.getBlockState(blockposition2).is(Blocks.TRIPWIRE)) { // Paper - Fix tripwire disarming not working as intended // Luminol - check allow first
+                         world.setBlock(blockposition2, (BlockState) iblockdata4.trySetValue(TripWireHookBlock.ATTACHED, flag4), 3);
+                         }
+                     }
diff --git a/...aiiju-Don-t-pathfind-outside-region.patch → ...aiiju-Don-t-pathfind-outside-region.patch b/...aiiju-Don-t-pathfind-outside-region.patch → ...aiiju-Don-t-pathfind-outside-region.patch
diff --git a/...ju-Vanilla-end-portal-teleportation.patch → ...ju-Vanilla-end-portal-teleportation.patch b/...ju-Vanilla-end-portal-teleportation.patch → ...ju-Vanilla-end-portal-teleportation.patch
diff --git a/...erver/0024-Petal-Reduce-sensor-work.patch → ...erver/0025-Petal-Reduce-sensor-work.patch b/...erver/0024-Petal-Reduce-sensor-work.patch → ...erver/0025-Petal-Reduce-sensor-work.patch
diff --git a/...ish-Improve-fluid-direction-caching.patch → ...ish-Improve-fluid-direction-caching.patch b/...ish-Improve-fluid-direction-caching.patch → ...ish-Improve-fluid-direction-caching.patch
diff --git a/...Cache-climbing-check-for-activation.patch → ...Cache-climbing-check-for-activation.patch b/...Cache-climbing-check-for-activation.patch → ...Cache-climbing-check-for-activation.patch
diff --git a/...erfish-Reduce-chunk-loading-lookups.patch → ...erfish-Reduce-chunk-loading-lookups.patch b/...erfish-Reduce-chunk-loading-lookups.patch → ...erfish-Reduce-chunk-loading-lookups.patch
diff --git a/...return-optimization-for-target-find.patch → ...return-optimization-for-target-find.patch b/...return-optimization-for-target-find.patch → ...return-optimization-for-target-find.patch
diff --git a/...per-6045-block-goal-shouldn-t-load-.patch → ...per-6045-block-goal-shouldn-t-load-.patch b/...per-6045-block-goal-shouldn-t-load-.patch → ...per-6045-block-goal-shouldn-t-load-.patch
diff --git a/...erfish-Skip-cloning-loot-parameters.patch → ...erfish-Skip-cloning-loot-parameters.patch b/...erfish-Skip-cloning-loot-parameters.patch → ...erfish-Skip-cloning-loot-parameters.patch
diff --git a/...ish-Reduce-projectile-chunk-loading.patch → ...ish-Reduce-projectile-chunk-loading.patch b/...ish-Reduce-projectile-chunk-loading.patch → ...ish-Reduce-projectile-chunk-loading.patch
diff --git a/...s/server/0032-Pufferfish-Entity-TTL.patch → ...s/server/0033-Pufferfish-Entity-TTL.patch b/...s/server/0032-Pufferfish-Entity-TTL.patch → ...s/server/0033-Pufferfish-Entity-TTL.patch
diff --git a/...ferfish-Dynamic-Activation-of-Brain.patch → ...ferfish-Dynamic-Activation-of-Brain.patch b/...ferfish-Dynamic-Activation-of-Brain.patch → ...ferfish-Dynamic-Activation-of-Brain.patch
diff --git a/...heck-for-spooky-season-once-an-hour.patch → ...heck-for-spooky-season-once-an-hour.patch b/...heck-for-spooky-season-once-an-hour.patch → ...heck-for-spooky-season-once-an-hour.patch
diff --git a/...035-Pufferfish-Optimize-suffocation.patch → ...036-Pufferfish-Optimize-suffocation.patch b/...035-Pufferfish-Optimize-suffocation.patch → ...036-Pufferfish-Optimize-suffocation.patch
diff --git a/...le-goal-selector-during-inactive-ti.patch → ...le-goal-selector-during-inactive-ti.patch b/...le-goal-selector-during-inactive-ti.patch → ...le-goal-selector-during-inactive-ti.patch
diff --git a/...r-ShapelessRecipes-comparison-for-V.patch → ...r-ShapelessRecipes-comparison-for-V.patch b/...r-ShapelessRecipes-comparison-for-V.patch → ...r-ShapelessRecipes-comparison-for-V.patch
diff --git a/...rver/0038-Pufferfish-SIMD-Utilities.patch → ...rver/0039-Pufferfish-SIMD-Utilities.patch b/...rver/0038-Pufferfish-SIMD-Utilities.patch → ...rver/0039-Pufferfish-SIMD-Utilities.patch
diff --git a/...le-Variable-entity-wake-up-duration.patch → ...le-Variable-entity-wake-up-duration.patch b/...le-Variable-entity-wake-up-duration.patch → ...le-Variable-entity-wake-up-duration.patch
diff --git a/...er/0040-Gale-Optimize-sun-burn-tick.patch → ...er/0041-Gale-Optimize-sun-burn-tick.patch b/...er/0040-Gale-Optimize-sun-burn-tick.patch → ...er/0041-Gale-Optimize-sun-burn-tick.patch
diff --git a/...41-Gale-Use-platform-math-functions.patch → ...42-Gale-Use-platform-math-functions.patch b/...41-Gale-Use-platform-math-functions.patch → ...42-Gale-Use-platform-math-functions.patch
diff --git a/...kip-entity-move-if-movement-is-zero.patch → ...kip-entity-move-if-movement-is-zero.patch b/...kip-entity-move-if-movement-is-zero.patch → ...kip-entity-move-if-movement-is-zero.patch
diff --git a/...0043-Gale-Optimize-noise-generation.patch → ...0044-Gale-Optimize-noise-generation.patch b/...0043-Gale-Optimize-noise-generation.patch → ...0044-Gale-Optimize-noise-generation.patch
diff --git a/...044-Gale-Faster-chunk-serialization.patch → ...045-Gale-Faster-chunk-serialization.patch b/...044-Gale-Faster-chunk-serialization.patch → ...045-Gale-Faster-chunk-serialization.patch
diff --git a/...a-and-Optional-allocation-in-Entity.patch → ...a-and-Optional-allocation-in-Entity.patch b/...a-and-Optional-allocation-in-Entity.patch → ...a-and-Optional-allocation-in-Entity.patch
diff --git a/...ttle-tracker-map-with-optimized-col.patch → ...ttle-tracker-map-with-optimized-col.patch b/...ttle-tracker-map-with-optimized-col.patch → ...ttle-tracker-map-with-optimized-col.patch
diff --git a/...parkly-Paper-Optimize-canSee-checks.patch → ...parkly-Paper-Optimize-canSee-checks.patch b/...parkly-Paper-Optimize-canSee-checks.patch → ...parkly-Paper-Optimize-canSee-checks.patch
diff --git a/...-MapItem-update-if-the-map-does-not.patch → ...-MapItem-update-if-the-map-does-not.patch b/...-MapItem-update-if-the-map-does-not.patch → ...-MapItem-update-if-the-map-does-not.patch
diff --git a/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch b/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch
diff --git a/...I-and-display-of-chunkhot-in-tpsbar.patch → ...I-and-display-of-chunkhot-in-tpsbar.patch b/...I-and-display-of-chunkhot-in-tpsbar.patch → ...I-and-display-of-chunkhot-in-tpsbar.patch
diff --git a/...1-Purpur-use-alternative-keep-alive.patch → ...2-Purpur-use-alternative-keep-alive.patch b/...1-Purpur-use-alternative-keep-alive.patch → ...2-Purpur-use-alternative-keep-alive.patch
diff --git a/...052-Leaf-Skip-event-if-no-listeners.patch → ...053-Leaf-Skip-event-if-no-listeners.patch b/...052-Leaf-Skip-event-if-no-listeners.patch → ...053-Leaf-Skip-event-if-no-listeners.patch
diff --git a/...-start-tick-and-finished-tick-event.patch → ...-start-tick-and-finished-tick-event.patch b/...-start-tick-and-finished-tick-event.patch → ...-start-tick-and-finished-tick-event.patch
diff --git a/patches/server/0054-Fix-MC-2025.patch → patches/server/0055-Fix-MC-2025.patch b/patches/server/0054-Fix-MC-2025.patch → patches/server/0055-Fix-MC-2025.patch
diff --git a/...er/0055-FoliaPR-Add-TPS-From-Region.patch → ...er/0056-FoliaPR-Add-TPS-From-Region.patch b/...er/0055-FoliaPR-Add-TPS-From-Region.patch → ...er/0056-FoliaPR-Add-TPS-From-Region.patch