From a92cfa3637c069045020ae9f9543715f39cb0a4f Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Fri, 2 Aug 2024 22:23:01 +0800 Subject: [PATCH] Try optimizing the task dispatching --- ...-Try-optimizing-the-task-dispatching.patch | 111 ++++++++++++++++++ ...aiiju-Don-t-pathfind-outside-region.patch} | 0 ...ch => 0021-Petal-Reduce-sensor-work.patch} | 0 ...Cache-climbing-check-for-activation.patch} | 0 ...ntityCollisionContext-a-live-repres.patch} | 0 ...ish-Improve-fluid-direction-caching.patch} | 0 ...025-Pufferfish-Optimize-suffocation.patch} | 0 ...return-optimization-for-target-find.patch} | 0 ...erfish-Reduce-chunk-loading-lookups.patch} | 0 ...per-6045-block-goal-shouldn-t-load-.patch} | 0 ...e-entity-fluid-lookups-if-no-fluids.patch} | 0 ...heck-for-spooky-season-once-an-hour.patch} | 0 ...erfish-Skip-cloning-loot-parameters.patch} | 0 ...patch => 0032-Pufferfish-Entity-TTL.patch} | 0 ...ferfish-Dynamic-Activation-of-Brain.patch} | 0 ...le-goal-selector-during-inactive-ti.patch} | 0 ...ufferfish-Reduce-entity-allocations.patch} | 0 ...ve-container-checking-with-a-bitset.patch} | 0 ...le-Variable-entity-wake-up-duration.patch} | 0 ...hunks-to-activate-climbing-entities.patch} | 0 ...=> 0039-Gale-Optimize-sun-burn-tick.patch} | 0 ...pelessRecipe-comparison-for-vanilla.patch} | 0 ...41-Gale-Use-platform-math-functions.patch} | 0 ...kip-entity-move-if-movement-is-zero.patch} | 0 ...0043-Gale-Optimize-noise-generation.patch} | 0 ...044-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 ...9-Purpur-use-alternative-keep-alive.patch} | 0 ...I-and-display-of-chunkhot-in-tpsbar.patch} | 0 ...051-Leaf-Skip-event-if-no-listeners.patch} | 0 ...-start-tick-and-finished-tick-event.patch} | 6 +- ...x-MC-2025.patch => 0053-Fix-MC-2025.patch} | 0 ...=> 0054-FoliaPR-Add-TPS-From-Region.patch} | 0 36 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 patches/server/0019-Try-optimizing-the-task-dispatching.patch rename patches/server/{0019-Kaiiju-Don-t-pathfind-outside-region.patch => 0020-Kaiiju-Don-t-pathfind-outside-region.patch} (100%) rename patches/server/{0020-Petal-Reduce-sensor-work.patch => 0021-Petal-Reduce-sensor-work.patch} (100%) rename patches/server/{0021-Pufferfish-Cache-climbing-check-for-activation.patch => 0022-Pufferfish-Cache-climbing-check-for-activation.patch} (100%) rename patches/server/{0022-Pufferfish-Make-EntityCollisionContext-a-live-repres.patch => 0023-Pufferfish-Make-EntityCollisionContext-a-live-repres.patch} (100%) rename patches/server/{0023-Pufferfish-Improve-fluid-direction-caching.patch => 0024-Pufferfish-Improve-fluid-direction-caching.patch} (100%) rename patches/server/{0024-Pufferfish-Optimize-suffocation.patch => 0025-Pufferfish-Optimize-suffocation.patch} (100%) rename patches/server/{0025-Pufferfish-Early-return-optimization-for-target-find.patch => 0026-Pufferfish-Early-return-optimization-for-target-find.patch} (100%) rename patches/server/{0026-Pufferfish-Reduce-chunk-loading-lookups.patch => 0027-Pufferfish-Reduce-chunk-loading-lookups.patch} (100%) rename patches/server/{0027-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch => 0028-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch} (100%) rename patches/server/{0028-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch => 0029-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch} (100%) rename patches/server/{0029-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch => 0030-Pufferfish-Only-check-for-spooky-season-once-an-hour.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-Entity-TTL.patch => 0032-Pufferfish-Entity-TTL.patch} (100%) rename patches/server/{0032-Pufferfish-Dynamic-Activation-of-Brain.patch => 0033-Pufferfish-Dynamic-Activation-of-Brain.patch} (100%) rename patches/server/{0033-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch => 0034-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch} (100%) rename patches/server/{0034-Pufferfish-Reduce-entity-allocations.patch => 0035-Pufferfish-Reduce-entity-allocations.patch} (100%) rename patches/server/{0035-Pufferfish-Improve-container-checking-with-a-bitset.patch => 0036-Pufferfish-Improve-container-checking-with-a-bitset.patch} (100%) rename patches/server/{0036-Gale-Variable-entity-wake-up-duration.patch => 0037-Gale-Variable-entity-wake-up-duration.patch} (100%) rename patches/server/{0037-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch => 0038-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch} (100%) rename patches/server/{0038-Gale-Optimize-sun-burn-tick.patch => 0039-Gale-Optimize-sun-burn-tick.patch} (100%) rename patches/server/{0039-Gale-Simpler-ShapelessRecipe-comparison-for-vanilla.patch => 0040-Gale-Simpler-ShapelessRecipe-comparison-for-vanilla.patch} (100%) rename patches/server/{0040-Gale-Use-platform-math-functions.patch => 0041-Gale-Use-platform-math-functions.patch} (100%) rename patches/server/{0041-Gale-Skip-entity-move-if-movement-is-zero.patch => 0042-Gale-Skip-entity-move-if-movement-is-zero.patch} (100%) rename patches/server/{0042-Gale-Optimize-noise-generation.patch => 0043-Gale-Optimize-noise-generation.patch} (100%) rename patches/server/{0043-Gale-Faster-chunk-serialization.patch => 0044-Gale-Faster-chunk-serialization.patch} (100%) rename patches/server/{0044-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch => 0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch} (100%) rename patches/server/{0045-Gale-Replace-throttle-tracker-map-with-optimized-col.patch => 0046-Gale-Replace-throttle-tracker-map-with-optimized-col.patch} (100%) rename patches/server/{0046-Sparkly-Paper-Optimize-canSee-checks.patch => 0047-Sparkly-Paper-Optimize-canSee-checks.patch} (100%) rename patches/server/{0047-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch => 0048-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch} (100%) rename patches/server/{0048-Purpur-use-alternative-keep-alive.patch => 0049-Purpur-use-alternative-keep-alive.patch} (100%) rename patches/server/{0049-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch => 0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch} (100%) rename patches/server/{0050-Leaf-Skip-event-if-no-listeners.patch => 0051-Leaf-Skip-event-if-no-listeners.patch} (100%) rename patches/server/{0051-Threaded-region-start-tick-and-finished-tick-event.patch => 0052-Threaded-region-start-tick-and-finished-tick-event.patch} (86%) rename patches/server/{0052-Fix-MC-2025.patch => 0053-Fix-MC-2025.patch} (100%) rename patches/server/{0053-FoliaPR-Add-TPS-From-Region.patch => 0054-FoliaPR-Add-TPS-From-Region.patch} (100%) diff --git a/patches/server/0019-Try-optimizing-the-task-dispatching.patch b/patches/server/0019-Try-optimizing-the-task-dispatching.patch new file mode 100644 index 0000000..e24d2b8 --- /dev/null +++ b/patches/server/0019-Try-optimizing-the-task-dispatching.patch @@ -0,0 +1,111 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrHua269 +Date: Fri, 2 Aug 2024 22:22:18 +0800 +Subject: [PATCH] Try optimizing the task dispatching + + +diff --git a/src/main/java/ca/spottedleaf/concurrentutil/scheduler/SchedulerThreadPool.java b/src/main/java/ca/spottedleaf/concurrentutil/scheduler/SchedulerThreadPool.java +index 8197ccb1c4e5878dbd8007b5fb514640765ec8e4..6a17cb6037bd15b367319bb0accb71813f078087 100644 +--- a/src/main/java/ca/spottedleaf/concurrentutil/scheduler/SchedulerThreadPool.java ++++ b/src/main/java/ca/spottedleaf/concurrentutil/scheduler/SchedulerThreadPool.java +@@ -366,6 +366,12 @@ public class SchedulerThreadPool { + "scheduled_state=" + this.scheduled.get() + "," + + "}"; + } ++ ++ // Luminol start ++ protected boolean flushExtraTask(){ ++ return false; ++ } ++ // Luminol end + } + + private static final class TickThreadRunner implements Runnable { +@@ -526,7 +532,7 @@ public class SchedulerThreadPool { + if (diff <= 0L) { + break; + } +- LockSupport.parkNanos(startState, diff); ++ if (!startStateTask.flushExtraTask()) LockSupport.parkNanos(startState, 1_000); // Luminol - Optimize task dispatching + if (this.scheduler.halted) { + return; + } +diff --git a/src/main/java/io/papermc/paper/threadedregions/ThreadedRegionizer.java b/src/main/java/io/papermc/paper/threadedregions/ThreadedRegionizer.java +index ce388e0ef231d7d73f75f5778c58eb40f6402f0f..bba0d3b572cf9aa7c03816c0a74b7579b2280210 100644 +--- a/src/main/java/io/papermc/paper/threadedregions/ThreadedRegionizer.java ++++ b/src/main/java/io/papermc/paper/threadedregions/ThreadedRegionizer.java +@@ -676,13 +676,13 @@ public final class ThreadedRegionizer> sectionByKey = new Long2ReferenceOpenHashMap<>(); + private final ReferenceOpenHashSet> deadSections = new ReferenceOpenHashSet<>(); +diff --git a/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java b/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java +index c43b263e6502ba48a876803385f8d05c5e84ba3e..350eeea4f2a1d3d5eec01d795e23d88cabd0ea07 100644 +--- a/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java ++++ b/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java +@@ -357,6 +357,54 @@ public final class TickRegionScheduler { + return !this.markNotTicking() || this.cancelled.get() ? null : Boolean.valueOf(ret); + } + ++ @Override ++ public boolean flushExtraTask(){ ++ if (this.region.region.state != ThreadedRegionizer.ThreadedRegion.STATE_READY){ ++ return false; ++ } ++ ++ if (this.cancelled.get()) { ++ return false; ++ } ++ ++ if (!this.tryMarkTicking()) { ++ if (!this.cancelled.get()) { ++ throw new IllegalStateException("Scheduled region should be acquirable"); ++ } ++ return false; ++ } ++ ++ if (this.cancelled.get()) { ++ this.markNotTicking(); ++ return false; ++ } ++ ++ if (this.region != null) { ++ TickRegionScheduler.setTickingRegion(this.region.region); ++ } ++ ++ try { ++ if (this.region == null){ ++ return false; ++ } ++ ++ if (this.region.region.getData().getTaskQueueData().executeChunkTask()){ ++ return true; ++ } ++ ++ if (this.region.region.getData().getTaskQueueData().executeTickTask()){ ++ return true; ++ } ++ }finally { ++ this.markNotTicking(); ++ if (this.region != null) { ++ TickRegionScheduler.setTickingRegion(null); ++ } ++ } ++ ++ return false; ++ } ++ + @Override + public final boolean runTick() { + // Remember, we are supposed use setScheduledStart if we return true here, otherwise diff --git a/patches/server/0019-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0020-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0019-Kaiiju-Don-t-pathfind-outside-region.patch rename to patches/server/0020-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0020-Petal-Reduce-sensor-work.patch b/patches/server/0021-Petal-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0020-Petal-Reduce-sensor-work.patch rename to patches/server/0021-Petal-Reduce-sensor-work.patch diff --git a/patches/server/0021-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0022-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from patches/server/0021-Pufferfish-Cache-climbing-check-for-activation.patch rename to patches/server/0022-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/patches/server/0022-Pufferfish-Make-EntityCollisionContext-a-live-repres.patch b/patches/server/0023-Pufferfish-Make-EntityCollisionContext-a-live-repres.patch similarity index 100% rename from patches/server/0022-Pufferfish-Make-EntityCollisionContext-a-live-repres.patch rename to patches/server/0023-Pufferfish-Make-EntityCollisionContext-a-live-repres.patch diff --git a/patches/server/0023-Pufferfish-Improve-fluid-direction-caching.patch b/patches/server/0024-Pufferfish-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0023-Pufferfish-Improve-fluid-direction-caching.patch rename to patches/server/0024-Pufferfish-Improve-fluid-direction-caching.patch diff --git a/patches/server/0024-Pufferfish-Optimize-suffocation.patch b/patches/server/0025-Pufferfish-Optimize-suffocation.patch similarity index 100% rename from patches/server/0024-Pufferfish-Optimize-suffocation.patch rename to patches/server/0025-Pufferfish-Optimize-suffocation.patch diff --git a/patches/server/0025-Pufferfish-Early-return-optimization-for-target-find.patch b/patches/server/0026-Pufferfish-Early-return-optimization-for-target-find.patch similarity index 100% rename from patches/server/0025-Pufferfish-Early-return-optimization-for-target-find.patch rename to patches/server/0026-Pufferfish-Early-return-optimization-for-target-find.patch diff --git a/patches/server/0026-Pufferfish-Reduce-chunk-loading-lookups.patch b/patches/server/0027-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0026-Pufferfish-Reduce-chunk-loading-lookups.patch rename to patches/server/0027-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0027-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0028-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch similarity index 100% rename from patches/server/0027-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch rename to patches/server/0028-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch diff --git a/patches/server/0028-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0029-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 100% rename from patches/server/0028-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/server/0029-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch diff --git a/patches/server/0029-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0030-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0029-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0030-Pufferfish-Only-check-for-spooky-season-once-an-hour.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-Entity-TTL.patch b/patches/server/0032-Pufferfish-Entity-TTL.patch similarity index 100% rename from patches/server/0031-Pufferfish-Entity-TTL.patch rename to patches/server/0032-Pufferfish-Entity-TTL.patch diff --git a/patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 100% rename from patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch diff --git a/patches/server/0033-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0034-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from patches/server/0033-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to patches/server/0034-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/patches/server/0034-Pufferfish-Reduce-entity-allocations.patch b/patches/server/0035-Pufferfish-Reduce-entity-allocations.patch similarity index 100% rename from patches/server/0034-Pufferfish-Reduce-entity-allocations.patch rename to patches/server/0035-Pufferfish-Reduce-entity-allocations.patch diff --git a/patches/server/0035-Pufferfish-Improve-container-checking-with-a-bitset.patch b/patches/server/0036-Pufferfish-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0035-Pufferfish-Improve-container-checking-with-a-bitset.patch rename to patches/server/0036-Pufferfish-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0036-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0037-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0036-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0037-Gale-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0037-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0038-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0037-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0038-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0038-Gale-Optimize-sun-burn-tick.patch b/patches/server/0039-Gale-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0038-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0039-Gale-Optimize-sun-burn-tick.patch diff --git a/patches/server/0039-Gale-Simpler-ShapelessRecipe-comparison-for-vanilla.patch b/patches/server/0040-Gale-Simpler-ShapelessRecipe-comparison-for-vanilla.patch similarity index 100% rename from patches/server/0039-Gale-Simpler-ShapelessRecipe-comparison-for-vanilla.patch rename to patches/server/0040-Gale-Simpler-ShapelessRecipe-comparison-for-vanilla.patch diff --git a/patches/server/0040-Gale-Use-platform-math-functions.patch b/patches/server/0041-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0040-Gale-Use-platform-math-functions.patch rename to patches/server/0041-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0041-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0041-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0042-Gale-Optimize-noise-generation.patch b/patches/server/0043-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0042-Gale-Optimize-noise-generation.patch rename to patches/server/0043-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0043-Gale-Faster-chunk-serialization.patch b/patches/server/0044-Gale-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0043-Gale-Faster-chunk-serialization.patch rename to patches/server/0044-Gale-Faster-chunk-serialization.patch diff --git a/patches/server/0044-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from patches/server/0044-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to patches/server/0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/patches/server/0045-Gale-Replace-throttle-tracker-map-with-optimized-col.patch b/patches/server/0046-Gale-Replace-throttle-tracker-map-with-optimized-col.patch similarity index 100% rename from patches/server/0045-Gale-Replace-throttle-tracker-map-with-optimized-col.patch rename to patches/server/0046-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0046-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0047-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0046-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0047-Sparkly-Paper-Optimize-canSee-checks.patch diff --git a/patches/server/0047-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/patches/server/0048-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from patches/server/0047-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to patches/server/0048-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/patches/server/0048-Purpur-use-alternative-keep-alive.patch b/patches/server/0049-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0048-Purpur-use-alternative-keep-alive.patch rename to patches/server/0049-Purpur-use-alternative-keep-alive.patch diff --git a/patches/server/0049-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch similarity index 100% rename from patches/server/0049-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch rename to patches/server/0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch diff --git a/patches/server/0050-Leaf-Skip-event-if-no-listeners.patch b/patches/server/0051-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0050-Leaf-Skip-event-if-no-listeners.patch rename to patches/server/0051-Leaf-Skip-event-if-no-listeners.patch diff --git a/patches/server/0051-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0052-Threaded-region-start-tick-and-finished-tick-event.patch similarity index 86% rename from patches/server/0051-Threaded-region-start-tick-and-finished-tick-event.patch rename to patches/server/0052-Threaded-region-start-tick-and-finished-tick-event.patch index ecca02f..b2b4c0f 100644 --- a/patches/server/0051-Threaded-region-start-tick-and-finished-tick-event.patch +++ b/patches/server/0052-Threaded-region-start-tick-and-finished-tick-event.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Threaded region start tick and finished tick event diff --git a/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java b/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java -index c43b263e6502ba48a876803385f8d05c5e84ba3e..9b1a2dd2538652298571c2abc3d9afb144fddd95 100644 +index 350eeea4f2a1d3d5eec01d795e23d88cabd0ea07..3588e9052afe8c3b8dc0872a73acb736062d3a2f 100644 --- a/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java +++ b/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java -@@ -394,7 +394,7 @@ public final class TickRegionScheduler { +@@ -442,7 +442,7 @@ public final class TickRegionScheduler { final long scheduledStart = this.getScheduledStart(); final long scheduledEnd = scheduledStart + TIME_BETWEEN_TICKS; @@ -17,7 +17,7 @@ index c43b263e6502ba48a876803385f8d05c5e84ba3e..9b1a2dd2538652298571c2abc3d9afb1 synchronized (this) { this.currentTickData = new TickTime( lastTickStart, scheduledStart, tickStart, cpuStart, -@@ -429,6 +429,7 @@ public final class TickRegionScheduler { +@@ -477,6 +477,7 @@ public final class TickRegionScheduler { ); this.addTickTime(time); diff --git a/patches/server/0052-Fix-MC-2025.patch b/patches/server/0053-Fix-MC-2025.patch similarity index 100% rename from patches/server/0052-Fix-MC-2025.patch rename to patches/server/0053-Fix-MC-2025.patch diff --git a/patches/server/0053-FoliaPR-Add-TPS-From-Region.patch b/patches/server/0054-FoliaPR-Add-TPS-From-Region.patch similarity index 100% rename from patches/server/0053-FoliaPR-Add-TPS-From-Region.patch rename to patches/server/0054-FoliaPR-Add-TPS-From-Region.patch