diff --git a/patches/server/0018-Add-config-for-watchdog-timeout.patch b/patches/server/0018-Add-config-for-watchdog-timeout.patch new file mode 100644 index 0000000..8f986b0 --- /dev/null +++ b/patches/server/0018-Add-config-for-watchdog-timeout.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrHua269 +Date: Tue, 31 Dec 2024 21:23:37 +0800 +Subject: [PATCH] Add config for watchdog timeout + + +diff --git a/src/main/java/io/papermc/paper/threadedregions/FoliaWatchdogThread.java b/src/main/java/io/papermc/paper/threadedregions/FoliaWatchdogThread.java +index 258d82ab2c78482e1561343e8e1f81fc33f1895e..967107c0f4a18a29877883ccddb4d7962f4b5788 100644 +--- a/src/main/java/io/papermc/paper/threadedregions/FoliaWatchdogThread.java ++++ b/src/main/java/io/papermc/paper/threadedregions/FoliaWatchdogThread.java +@@ -65,7 +65,7 @@ public final class FoliaWatchdogThread extends Thread { + + for (final RunningTick tick : ticks) { + final long elapsed = now - tick.lastPrint; +- if (elapsed <= TimeUnit.SECONDS.toNanos(5L)) { ++ if (elapsed <= TimeUnit.MILLISECONDS.toNanos(me.earthme.luminol.config.modules.misc.FoliaWatchogConfig.tickRegionTimeOutMs)) { // Luminol - Add config for watchdog timeout + continue; + } + tick.lastPrint = now; +diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/FoliaWatchogConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/FoliaWatchogConfig.java +new file mode 100644 +index 0000000000000000000000000000000000000000..de58b5bf9dedf35bc56a9211d0769b988704a7fe +--- /dev/null ++++ b/src/main/java/me/earthme/luminol/config/modules/misc/FoliaWatchogConfig.java +@@ -0,0 +1,20 @@ ++package me.earthme.luminol.config.modules.misc; ++ ++import me.earthme.luminol.config.ConfigInfo; ++import me.earthme.luminol.config.EnumConfigCategory; ++import me.earthme.luminol.config.IConfigModule; ++ ++public class FoliaWatchogConfig implements IConfigModule { ++ @ConfigInfo(baseName = "tick_region_time_out_ms") ++ public static int tickRegionTimeOutMs = 5000; ++ ++ @Override ++ public EnumConfigCategory getCategory() { ++ return EnumConfigCategory.MISC; ++ } ++ ++ @Override ++ public String getBaseName() { ++ return "folia_watchdog"; ++ } ++} diff --git a/patches/server/0018-Try-fixing-folia-spector-teleportation.patch b/patches/server/0019-Try-fixing-folia-spector-teleportation.patch similarity index 100% rename from patches/server/0018-Try-fixing-folia-spector-teleportation.patch rename to patches/server/0019-Try-fixing-folia-spector-teleportation.patch diff --git a/patches/server/0019-Teleport-async-if-entity-was-moving-to-another-regio.patch b/patches/server/0020-Teleport-async-if-entity-was-moving-to-another-regio.patch similarity index 100% rename from patches/server/0019-Teleport-async-if-entity-was-moving-to-another-regio.patch rename to patches/server/0020-Teleport-async-if-entity-was-moving-to-another-regio.patch diff --git a/patches/server/0020-Try-fixing-folia-off-region-POI-accessing-issue.patch b/patches/server/0021-Try-fixing-folia-off-region-POI-accessing-issue.patch similarity index 100% rename from patches/server/0020-Try-fixing-folia-off-region-POI-accessing-issue.patch rename to patches/server/0021-Try-fixing-folia-off-region-POI-accessing-issue.patch diff --git a/patches/server/0021-Prevent-teleportAsync-calling-during-moving-event-be.patch b/patches/server/0022-Prevent-teleportAsync-calling-during-moving-event-be.patch similarity index 100% rename from patches/server/0021-Prevent-teleportAsync-calling-during-moving-event-be.patch rename to patches/server/0022-Prevent-teleportAsync-calling-during-moving-event-be.patch diff --git a/patches/server/0022-Try-optimizing-the-task-dispatching.patch b/patches/server/0023-Try-optimizing-the-task-dispatching.patch similarity index 100% rename from patches/server/0022-Try-optimizing-the-task-dispatching.patch rename to patches/server/0023-Try-optimizing-the-task-dispatching.patch diff --git a/patches/server/0023-Force-disable-builtin-spark-plugin.patch b/patches/server/0024-Force-disable-builtin-spark-plugin.patch similarity index 100% rename from patches/server/0023-Force-disable-builtin-spark-plugin.patch rename to patches/server/0024-Force-disable-builtin-spark-plugin.patch diff --git a/patches/server/0024-Check-allow-before-getting-block-state-while-tripwir.patch b/patches/server/0025-Check-allow-before-getting-block-state-while-tripwir.patch similarity index 100% rename from patches/server/0024-Check-allow-before-getting-block-state-while-tripwir.patch rename to patches/server/0025-Check-allow-before-getting-block-state-while-tripwir.patch diff --git a/patches/server/0025-LinearPurpur-Linear-region-format.patch b/patches/server/0026-LinearPurpur-Linear-region-format.patch similarity index 100% rename from patches/server/0025-LinearPurpur-Linear-region-format.patch rename to patches/server/0026-LinearPurpur-Linear-region-format.patch diff --git a/patches/server/0026-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0027-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0026-Kaiiju-Don-t-pathfind-outside-region.patch rename to patches/server/0027-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0027-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0028-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from patches/server/0027-Kaiiju-Vanilla-end-portal-teleportation.patch rename to patches/server/0028-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/patches/server/0028-Petal-Reduce-sensor-work.patch b/patches/server/0029-Petal-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0028-Petal-Reduce-sensor-work.patch rename to patches/server/0029-Petal-Reduce-sensor-work.patch diff --git a/patches/server/0029-Pufferfish-Improve-fluid-direction-caching.patch b/patches/server/0030-Pufferfish-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0029-Pufferfish-Improve-fluid-direction-caching.patch rename to patches/server/0030-Pufferfish-Improve-fluid-direction-caching.patch diff --git a/patches/server/0030-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0031-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from patches/server/0030-Pufferfish-Cache-climbing-check-for-activation.patch rename to patches/server/0031-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/patches/server/0031-Pufferfish-Reduce-chunk-loading-lookups.patch b/patches/server/0032-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0031-Pufferfish-Reduce-chunk-loading-lookups.patch rename to patches/server/0032-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0032-Pufferfish-Early-return-optimization-for-target-find.patch b/patches/server/0033-Pufferfish-Early-return-optimization-for-target-find.patch similarity index 100% rename from patches/server/0032-Pufferfish-Early-return-optimization-for-target-find.patch rename to patches/server/0033-Pufferfish-Early-return-optimization-for-target-find.patch diff --git a/patches/server/0033-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0034-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch similarity index 100% rename from patches/server/0033-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch rename to patches/server/0034-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch diff --git a/patches/server/0034-Pufferfish-Skip-cloning-loot-parameters.patch b/patches/server/0035-Pufferfish-Skip-cloning-loot-parameters.patch similarity index 100% rename from patches/server/0034-Pufferfish-Skip-cloning-loot-parameters.patch rename to patches/server/0035-Pufferfish-Skip-cloning-loot-parameters.patch diff --git a/patches/server/0035-Pufferfish-Reduce-projectile-chunk-loading.patch b/patches/server/0036-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0035-Pufferfish-Reduce-projectile-chunk-loading.patch rename to patches/server/0036-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0036-Pufferfish-Entity-TTL.patch b/patches/server/0037-Pufferfish-Entity-TTL.patch similarity index 100% rename from patches/server/0036-Pufferfish-Entity-TTL.patch rename to patches/server/0037-Pufferfish-Entity-TTL.patch diff --git a/patches/server/0037-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0038-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 100% rename from patches/server/0037-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0038-Pufferfish-Dynamic-Activation-of-Brain.patch diff --git a/patches/server/0038-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0039-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0038-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0039-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0039-Pufferfish-Optimize-suffocation.patch b/patches/server/0040-Pufferfish-Optimize-suffocation.patch similarity index 100% rename from patches/server/0039-Pufferfish-Optimize-suffocation.patch rename to patches/server/0040-Pufferfish-Optimize-suffocation.patch diff --git a/patches/server/0040-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0041-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from patches/server/0040-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to patches/server/0041-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/patches/server/0041-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch b/patches/server/0042-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch similarity index 100% rename from patches/server/0041-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch rename to patches/server/0042-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch diff --git a/patches/server/0042-Pufferfish-SIMD-Utilities.patch b/patches/server/0043-Pufferfish-SIMD-Utilities.patch similarity index 100% rename from patches/server/0042-Pufferfish-SIMD-Utilities.patch rename to patches/server/0043-Pufferfish-SIMD-Utilities.patch diff --git a/patches/server/0043-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0044-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0043-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0044-Gale-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0044-Gale-Optimize-sun-burn-tick.patch b/patches/server/0045-Gale-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0044-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0045-Gale-Optimize-sun-burn-tick.patch diff --git a/patches/server/0045-Gale-Use-platform-math-functions.patch b/patches/server/0046-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0045-Gale-Use-platform-math-functions.patch rename to patches/server/0046-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0046-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0047-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0046-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0047-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0047-Gale-Optimize-noise-generation.patch b/patches/server/0048-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0047-Gale-Optimize-noise-generation.patch rename to patches/server/0048-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0048-Gale-Faster-chunk-serialization.patch b/patches/server/0049-Gale-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0048-Gale-Faster-chunk-serialization.patch rename to patches/server/0049-Gale-Faster-chunk-serialization.patch diff --git a/patches/server/0049-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0050-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from patches/server/0049-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to patches/server/0050-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/patches/server/0050-Gale-Replace-throttle-tracker-map-with-optimized-col.patch b/patches/server/0051-Gale-Replace-throttle-tracker-map-with-optimized-col.patch similarity index 100% rename from patches/server/0050-Gale-Replace-throttle-tracker-map-with-optimized-col.patch rename to patches/server/0051-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0051-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0052-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0051-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0052-Sparkly-Paper-Optimize-canSee-checks.patch diff --git a/patches/server/0052-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/patches/server/0053-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from patches/server/0052-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to patches/server/0053-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/patches/server/0053-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0054-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0053-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0054-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0054-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0055-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch similarity index 100% rename from patches/server/0054-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch rename to patches/server/0055-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch diff --git a/patches/server/0055-Purpur-use-alternative-keep-alive.patch b/patches/server/0056-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0055-Purpur-use-alternative-keep-alive.patch rename to patches/server/0056-Purpur-use-alternative-keep-alive.patch diff --git a/patches/server/0056-Leaf-Skip-event-if-no-listeners.patch b/patches/server/0057-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0056-Leaf-Skip-event-if-no-listeners.patch rename to patches/server/0057-Leaf-Skip-event-if-no-listeners.patch diff --git a/patches/server/0057-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch b/patches/server/0058-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch similarity index 100% rename from patches/server/0057-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch rename to patches/server/0058-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch diff --git a/patches/server/0058-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0059-Threaded-region-start-tick-and-finished-tick-event.patch similarity index 100% rename from patches/server/0058-Threaded-region-start-tick-and-finished-tick-event.patch rename to patches/server/0059-Threaded-region-start-tick-and-finished-tick-event.patch diff --git a/patches/server/0059-Fix-MC-2025.patch b/patches/server/0060-Fix-MC-2025.patch similarity index 100% rename from patches/server/0059-Fix-MC-2025.patch rename to patches/server/0060-Fix-MC-2025.patch diff --git a/patches/server/0060-FoliaPR-Add-TPS-From-Region.patch b/patches/server/0061-FoliaPR-Add-TPS-From-Region.patch similarity index 100% rename from patches/server/0060-FoliaPR-Add-TPS-From-Region.patch rename to patches/server/0061-FoliaPR-Add-TPS-From-Region.patch