From 98bbcd67e439993a05ba83335ef2c6c76adebb70 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Tue, 6 Aug 2024 21:07:45 +0800 Subject: [PATCH] Check allow before getting block state while tripwire state updating --- ...re-getting-block-state-while-tripwir.patch | 20 +++++++++++++++++++ ...aiiju-Don-t-pathfind-outside-region.patch} | 0 ...ju-Vanilla-end-portal-teleportation.patch} | 0 ...ch => 0025-Petal-Reduce-sensor-work.patch} | 0 ...ish-Improve-fluid-direction-caching.patch} | 0 ...Cache-climbing-check-for-activation.patch} | 0 ...erfish-Reduce-chunk-loading-lookups.patch} | 0 ...return-optimization-for-target-find.patch} | 0 ...per-6045-block-goal-shouldn-t-load-.patch} | 0 ...erfish-Skip-cloning-loot-parameters.patch} | 0 ...ish-Reduce-projectile-chunk-loading.patch} | 0 ...patch => 0033-Pufferfish-Entity-TTL.patch} | 0 ...ferfish-Dynamic-Activation-of-Brain.patch} | 0 ...heck-for-spooky-season-once-an-hour.patch} | 0 ...036-Pufferfish-Optimize-suffocation.patch} | 0 ...le-goal-selector-during-inactive-ti.patch} | 0 ...r-ShapelessRecipes-comparison-for-V.patch} | 0 ...h => 0039-Pufferfish-SIMD-Utilities.patch} | 0 ...le-Variable-entity-wake-up-duration.patch} | 0 ...=> 0041-Gale-Optimize-sun-burn-tick.patch} | 0 ...42-Gale-Use-platform-math-functions.patch} | 0 ...kip-entity-move-if-movement-is-zero.patch} | 0 ...0044-Gale-Optimize-noise-generation.patch} | 0 ...045-Gale-Faster-chunk-serialization.patch} | 0 ...a-and-Optional-allocation-in-Entity.patch} | 0 ...ttle-tracker-map-with-optimized-col.patch} | 0 ...parkly-Paper-Optimize-canSee-checks.patch} | 0 ...-MapItem-update-if-the-map-does-not.patch} | 0 ...-distanceToSqr-call-in-ServerEntity.patch} | 0 ...I-and-display-of-chunkhot-in-tpsbar.patch} | 0 ...2-Purpur-use-alternative-keep-alive.patch} | 0 ...053-Leaf-Skip-event-if-no-listeners.patch} | 0 ...-start-tick-and-finished-tick-event.patch} | 0 ...x-MC-2025.patch => 0055-Fix-MC-2025.patch} | 0 ...=> 0056-FoliaPR-Add-TPS-From-Region.patch} | 0 35 files changed, 20 insertions(+) create mode 100644 patches/server/0022-Check-allow-before-getting-block-state-while-tripwir.patch rename patches/server/{0022-Kaiiju-Don-t-pathfind-outside-region.patch => 0023-Kaiiju-Don-t-pathfind-outside-region.patch} (100%) rename patches/server/{0023-Kaiiju-Vanilla-end-portal-teleportation.patch => 0024-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%) rename patches/server/{0024-Petal-Reduce-sensor-work.patch => 0025-Petal-Reduce-sensor-work.patch} (100%) rename patches/server/{0025-Pufferfish-Improve-fluid-direction-caching.patch => 0026-Pufferfish-Improve-fluid-direction-caching.patch} (100%) rename patches/server/{0026-Pufferfish-Cache-climbing-check-for-activation.patch => 0027-Pufferfish-Cache-climbing-check-for-activation.patch} (100%) rename patches/server/{0027-Pufferfish-Reduce-chunk-loading-lookups.patch => 0028-Pufferfish-Reduce-chunk-loading-lookups.patch} (100%) rename patches/server/{0028-Pufferfish-Early-return-optimization-for-target-find.patch => 0029-Pufferfish-Early-return-optimization-for-target-find.patch} (100%) rename patches/server/{0029-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch => 0030-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch} (100%) rename patches/server/{0030-Pufferfish-Skip-cloning-loot-parameters.patch => 0031-Pufferfish-Skip-cloning-loot-parameters.patch} (100%) rename patches/server/{0031-Pufferfish-Reduce-projectile-chunk-loading.patch => 0032-Pufferfish-Reduce-projectile-chunk-loading.patch} (100%) rename patches/server/{0032-Pufferfish-Entity-TTL.patch => 0033-Pufferfish-Entity-TTL.patch} (100%) rename patches/server/{0033-Pufferfish-Dynamic-Activation-of-Brain.patch => 0034-Pufferfish-Dynamic-Activation-of-Brain.patch} (100%) rename patches/server/{0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch => 0035-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch} (100%) rename patches/server/{0035-Pufferfish-Optimize-suffocation.patch => 0036-Pufferfish-Optimize-suffocation.patch} (100%) rename patches/server/{0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch => 0037-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch} (100%) rename patches/server/{0037-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch => 0038-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch} (100%) rename patches/server/{0038-Pufferfish-SIMD-Utilities.patch => 0039-Pufferfish-SIMD-Utilities.patch} (100%) rename patches/server/{0039-Gale-Variable-entity-wake-up-duration.patch => 0040-Gale-Variable-entity-wake-up-duration.patch} (100%) rename patches/server/{0040-Gale-Optimize-sun-burn-tick.patch => 0041-Gale-Optimize-sun-burn-tick.patch} (100%) rename patches/server/{0041-Gale-Use-platform-math-functions.patch => 0042-Gale-Use-platform-math-functions.patch} (100%) rename patches/server/{0042-Gale-Skip-entity-move-if-movement-is-zero.patch => 0043-Gale-Skip-entity-move-if-movement-is-zero.patch} (100%) rename patches/server/{0043-Gale-Optimize-noise-generation.patch => 0044-Gale-Optimize-noise-generation.patch} (100%) rename patches/server/{0044-Gale-Faster-chunk-serialization.patch => 0045-Gale-Faster-chunk-serialization.patch} (100%) rename patches/server/{0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch => 0046-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch} (100%) rename patches/server/{0046-Gale-Replace-throttle-tracker-map-with-optimized-col.patch => 0047-Gale-Replace-throttle-tracker-map-with-optimized-col.patch} (100%) rename patches/server/{0047-Sparkly-Paper-Optimize-canSee-checks.patch => 0048-Sparkly-Paper-Optimize-canSee-checks.patch} (100%) rename patches/server/{0048-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch => 0049-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch} (100%) rename patches/server/{0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch => 0050-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch} (100%) rename patches/server/{0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch => 0051-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch} (100%) rename patches/server/{0051-Purpur-use-alternative-keep-alive.patch => 0052-Purpur-use-alternative-keep-alive.patch} (100%) rename patches/server/{0052-Leaf-Skip-event-if-no-listeners.patch => 0053-Leaf-Skip-event-if-no-listeners.patch} (100%) rename patches/server/{0053-Threaded-region-start-tick-and-finished-tick-event.patch => 0054-Threaded-region-start-tick-and-finished-tick-event.patch} (100%) rename patches/server/{0054-Fix-MC-2025.patch => 0055-Fix-MC-2025.patch} (100%) rename patches/server/{0055-FoliaPR-Add-TPS-From-Region.patch => 0056-FoliaPR-Add-TPS-From-Region.patch} (100%) 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 new file mode 100644 index 0000000..21c38a7 --- /dev/null +++ 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 +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/patches/server/0022-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0023-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0022-Kaiiju-Don-t-pathfind-outside-region.patch rename to patches/server/0023-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0023-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0024-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from patches/server/0023-Kaiiju-Vanilla-end-portal-teleportation.patch rename to patches/server/0024-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/patches/server/0024-Petal-Reduce-sensor-work.patch b/patches/server/0025-Petal-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0024-Petal-Reduce-sensor-work.patch rename to patches/server/0025-Petal-Reduce-sensor-work.patch diff --git a/patches/server/0025-Pufferfish-Improve-fluid-direction-caching.patch b/patches/server/0026-Pufferfish-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0025-Pufferfish-Improve-fluid-direction-caching.patch rename to patches/server/0026-Pufferfish-Improve-fluid-direction-caching.patch diff --git a/patches/server/0026-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0027-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from patches/server/0026-Pufferfish-Cache-climbing-check-for-activation.patch rename to patches/server/0027-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/patches/server/0027-Pufferfish-Reduce-chunk-loading-lookups.patch b/patches/server/0028-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0027-Pufferfish-Reduce-chunk-loading-lookups.patch rename to patches/server/0028-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0028-Pufferfish-Early-return-optimization-for-target-find.patch b/patches/server/0029-Pufferfish-Early-return-optimization-for-target-find.patch similarity index 100% rename from patches/server/0028-Pufferfish-Early-return-optimization-for-target-find.patch rename to patches/server/0029-Pufferfish-Early-return-optimization-for-target-find.patch diff --git a/patches/server/0029-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0030-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch similarity index 100% rename from patches/server/0029-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch rename to patches/server/0030-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch diff --git a/patches/server/0030-Pufferfish-Skip-cloning-loot-parameters.patch b/patches/server/0031-Pufferfish-Skip-cloning-loot-parameters.patch similarity index 100% rename from patches/server/0030-Pufferfish-Skip-cloning-loot-parameters.patch rename to patches/server/0031-Pufferfish-Skip-cloning-loot-parameters.patch diff --git a/patches/server/0031-Pufferfish-Reduce-projectile-chunk-loading.patch b/patches/server/0032-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0031-Pufferfish-Reduce-projectile-chunk-loading.patch rename to patches/server/0032-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0032-Pufferfish-Entity-TTL.patch b/patches/server/0033-Pufferfish-Entity-TTL.patch similarity index 100% rename from patches/server/0032-Pufferfish-Entity-TTL.patch rename to patches/server/0033-Pufferfish-Entity-TTL.patch diff --git a/patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0034-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 100% rename from patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0034-Pufferfish-Dynamic-Activation-of-Brain.patch diff --git a/patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0035-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0035-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0035-Pufferfish-Optimize-suffocation.patch b/patches/server/0036-Pufferfish-Optimize-suffocation.patch similarity index 100% rename from patches/server/0035-Pufferfish-Optimize-suffocation.patch rename to patches/server/0036-Pufferfish-Optimize-suffocation.patch diff --git a/patches/server/0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0037-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from patches/server/0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to patches/server/0037-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/patches/server/0037-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch b/patches/server/0038-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch similarity index 100% rename from patches/server/0037-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch rename to patches/server/0038-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch diff --git a/patches/server/0038-Pufferfish-SIMD-Utilities.patch b/patches/server/0039-Pufferfish-SIMD-Utilities.patch similarity index 100% rename from patches/server/0038-Pufferfish-SIMD-Utilities.patch rename to patches/server/0039-Pufferfish-SIMD-Utilities.patch diff --git a/patches/server/0039-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0040-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0039-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0040-Gale-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0040-Gale-Optimize-sun-burn-tick.patch b/patches/server/0041-Gale-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0040-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0041-Gale-Optimize-sun-burn-tick.patch diff --git a/patches/server/0041-Gale-Use-platform-math-functions.patch b/patches/server/0042-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0041-Gale-Use-platform-math-functions.patch rename to patches/server/0042-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0043-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0043-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0043-Gale-Optimize-noise-generation.patch b/patches/server/0044-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0043-Gale-Optimize-noise-generation.patch rename to patches/server/0044-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0044-Gale-Faster-chunk-serialization.patch b/patches/server/0045-Gale-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0044-Gale-Faster-chunk-serialization.patch rename to patches/server/0045-Gale-Faster-chunk-serialization.patch diff --git a/patches/server/0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0046-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from patches/server/0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to patches/server/0046-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/patches/server/0046-Gale-Replace-throttle-tracker-map-with-optimized-col.patch b/patches/server/0047-Gale-Replace-throttle-tracker-map-with-optimized-col.patch similarity index 100% rename from patches/server/0046-Gale-Replace-throttle-tracker-map-with-optimized-col.patch rename to patches/server/0047-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0047-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0048-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0047-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0048-Sparkly-Paper-Optimize-canSee-checks.patch diff --git a/patches/server/0048-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/patches/server/0049-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from patches/server/0048-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to patches/server/0049-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/patches/server/0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0050-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0050-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0051-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch similarity index 100% rename from patches/server/0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch rename to patches/server/0051-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch diff --git a/patches/server/0051-Purpur-use-alternative-keep-alive.patch b/patches/server/0052-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0051-Purpur-use-alternative-keep-alive.patch rename to patches/server/0052-Purpur-use-alternative-keep-alive.patch diff --git a/patches/server/0052-Leaf-Skip-event-if-no-listeners.patch b/patches/server/0053-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0052-Leaf-Skip-event-if-no-listeners.patch rename to patches/server/0053-Leaf-Skip-event-if-no-listeners.patch diff --git a/patches/server/0053-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0054-Threaded-region-start-tick-and-finished-tick-event.patch similarity index 100% rename from patches/server/0053-Threaded-region-start-tick-and-finished-tick-event.patch rename to patches/server/0054-Threaded-region-start-tick-and-finished-tick-event.patch diff --git a/patches/server/0054-Fix-MC-2025.patch b/patches/server/0055-Fix-MC-2025.patch similarity index 100% rename from patches/server/0054-Fix-MC-2025.patch rename to patches/server/0055-Fix-MC-2025.patch diff --git a/patches/server/0055-FoliaPR-Add-TPS-From-Region.patch b/patches/server/0056-FoliaPR-Add-TPS-From-Region.patch similarity index 100% rename from patches/server/0055-FoliaPR-Add-TPS-From-Region.patch rename to patches/server/0056-FoliaPR-Add-TPS-From-Region.patch