From 0d6b9a051fa0ce5e4061df388c7b0c165a62ca5f Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Tue, 31 Dec 2024 17:47:06 +0800 Subject: [PATCH] Add config for watchdog timeout --- ...0020-Add-config-for-watchdog-timeout.patch | 45 +++++++++++++++++++ ...-fixing-folia-spector-teleportation.patch} | 0 ...-entity-was-moving-to-another-regio.patch} | 0 ...olia-off-region-POI-accessing-issue.patch} | 0 ...-Force-disable-builtin-spark-plugin.patch} | 0 ...aiiju-Don-t-pathfind-outside-region.patch} | 0 ...ju-Vanilla-end-portal-teleportation.patch} | 0 ...iju-Entity-tick-and-removal-limiter.patch} | 0 ...ch => 0028-Petal-Reduce-sensor-work.patch} | 0 ...Cache-climbing-check-for-activation.patch} | 0 ...erfish-Reduce-chunk-loading-lookups.patch} | 0 ...per-6045-block-goal-shouldn-t-load-.patch} | 0 ...ish-Reduce-projectile-chunk-loading.patch} | 0 ...heck-for-spooky-season-once-an-hour.patch} | 0 ...034-Pufferfish-Optimize-suffocation.patch} | 0 ...ferfish-Dynamic-Activation-of-Brain.patch} | 0 ...le-goal-selector-during-inactive-ti.patch} | 0 ...h => 0037-Pufferfish-SIMD-Utilities.patch} | 0 ...le-Variable-entity-wake-up-duration.patch} | 0 ...=> 0039-Gale-Optimize-sun-burn-tick.patch} | 0 ...40-Gale-Use-platform-math-functions.patch} | 0 ...0041-Gale-Optimize-noise-generation.patch} | 0 ...a-and-Optional-allocation-in-Entity.patch} | 0 ...ttle-tracker-map-with-optimized-col.patch} | 0 ...kip-entity-move-if-movement-is-zero.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 ...049-Leaf-Skip-event-if-no-listeners.patch} | 0 ...0-Purpur-use-alternative-keep-alive.patch} | 0 ...-start-tick-and-finished-tick-event.patch} | 0 ...x-MC-2025.patch => 0052-Fix-MC-2025.patch} | 0 ...=> 0053-FoliaPR-Add-TPS-From-Region.patch} | 0 ...=> 0054-Leaves-Fix-color-in-console.patch} | 0 35 files changed, 45 insertions(+) create mode 100644 patches/server/0020-Add-config-for-watchdog-timeout.patch rename patches/server/{0020-Try-fixing-folia-spector-teleportation.patch => 0021-Try-fixing-folia-spector-teleportation.patch} (100%) rename patches/server/{0021-Teleport-async-if-entity-was-moving-to-another-regio.patch => 0022-Teleport-async-if-entity-was-moving-to-another-regio.patch} (100%) rename patches/server/{0022-Try-fixing-folia-off-region-POI-accessing-issue.patch => 0023-Try-fixing-folia-off-region-POI-accessing-issue.patch} (100%) rename patches/server/{0023-Force-disable-builtin-spark-plugin.patch => 0024-Force-disable-builtin-spark-plugin.patch} (100%) rename patches/server/{0024-Kaiiju-Don-t-pathfind-outside-region.patch => 0025-Kaiiju-Don-t-pathfind-outside-region.patch} (100%) rename patches/server/{0025-Kaiiju-Vanilla-end-portal-teleportation.patch => 0026-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%) rename patches/server/{0026-Kaiiju-Entity-tick-and-removal-limiter.patch => 0027-Kaiiju-Entity-tick-and-removal-limiter.patch} (100%) rename patches/server/{0027-Petal-Reduce-sensor-work.patch => 0028-Petal-Reduce-sensor-work.patch} (100%) rename patches/server/{0028-Pufferfish-Cache-climbing-check-for-activation.patch => 0029-Pufferfish-Cache-climbing-check-for-activation.patch} (100%) rename patches/server/{0029-Pufferfish-Reduce-chunk-loading-lookups.patch => 0030-Pufferfish-Reduce-chunk-loading-lookups.patch} (100%) rename patches/server/{0030-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch => 0031-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.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-Only-check-for-spooky-season-once-an-hour.patch => 0033-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch} (100%) rename patches/server/{0033-Pufferfish-Optimize-suffocation.patch => 0034-Pufferfish-Optimize-suffocation.patch} (100%) rename patches/server/{0034-Pufferfish-Dynamic-Activation-of-Brain.patch => 0035-Pufferfish-Dynamic-Activation-of-Brain.patch} (100%) rename patches/server/{0035-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch => 0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch} (100%) rename patches/server/{0036-Pufferfish-SIMD-Utilities.patch => 0037-Pufferfish-SIMD-Utilities.patch} (100%) rename patches/server/{0037-Gale-Variable-entity-wake-up-duration.patch => 0038-Gale-Variable-entity-wake-up-duration.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-Use-platform-math-functions.patch => 0040-Gale-Use-platform-math-functions.patch} (100%) rename patches/server/{0040-Gale-Optimize-noise-generation.patch => 0041-Gale-Optimize-noise-generation.patch} (100%) rename patches/server/{0041-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch => 0042-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch} (100%) rename patches/server/{0042-Gale-Replace-throttle-tracker-map-with-optimized-col.patch => 0043-Gale-Replace-throttle-tracker-map-with-optimized-col.patch} (100%) rename patches/server/{0043-Gale-Skip-entity-move-if-movement-is-zero.patch => 0044-Gale-Skip-entity-move-if-movement-is-zero.patch} (100%) rename patches/server/{0044-Sparkly-Paper-Optimize-canSee-checks.patch => 0045-Sparkly-Paper-Optimize-canSee-checks.patch} (100%) rename patches/server/{0045-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch => 0046-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch} (100%) rename patches/server/{0046-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch => 0047-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch} (100%) rename patches/server/{0047-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch => 0048-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch} (100%) rename patches/server/{0048-Leaf-Skip-event-if-no-listeners.patch => 0049-Leaf-Skip-event-if-no-listeners.patch} (100%) rename patches/server/{0049-Purpur-use-alternative-keep-alive.patch => 0050-Purpur-use-alternative-keep-alive.patch} (100%) rename patches/server/{0050-Threaded-region-start-tick-and-finished-tick-event.patch => 0051-Threaded-region-start-tick-and-finished-tick-event.patch} (100%) rename patches/server/{0051-Fix-MC-2025.patch => 0052-Fix-MC-2025.patch} (100%) rename patches/server/{0052-FoliaPR-Add-TPS-From-Region.patch => 0053-FoliaPR-Add-TPS-From-Region.patch} (100%) rename patches/server/{0053-Leaves-Fix-color-in-console.patch => 0054-Leaves-Fix-color-in-console.patch} (100%) diff --git a/patches/server/0020-Add-config-for-watchdog-timeout.patch b/patches/server/0020-Add-config-for-watchdog-timeout.patch new file mode 100644 index 0000000..e2357b5 --- /dev/null +++ b/patches/server/0020-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 17:45:55 +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/0020-Try-fixing-folia-spector-teleportation.patch b/patches/server/0021-Try-fixing-folia-spector-teleportation.patch similarity index 100% rename from patches/server/0020-Try-fixing-folia-spector-teleportation.patch rename to patches/server/0021-Try-fixing-folia-spector-teleportation.patch diff --git a/patches/server/0021-Teleport-async-if-entity-was-moving-to-another-regio.patch b/patches/server/0022-Teleport-async-if-entity-was-moving-to-another-regio.patch similarity index 100% rename from patches/server/0021-Teleport-async-if-entity-was-moving-to-another-regio.patch rename to patches/server/0022-Teleport-async-if-entity-was-moving-to-another-regio.patch diff --git a/patches/server/0022-Try-fixing-folia-off-region-POI-accessing-issue.patch b/patches/server/0023-Try-fixing-folia-off-region-POI-accessing-issue.patch similarity index 100% rename from patches/server/0022-Try-fixing-folia-off-region-POI-accessing-issue.patch rename to patches/server/0023-Try-fixing-folia-off-region-POI-accessing-issue.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-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0025-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0024-Kaiiju-Don-t-pathfind-outside-region.patch rename to patches/server/0025-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0025-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0026-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from patches/server/0025-Kaiiju-Vanilla-end-portal-teleportation.patch rename to patches/server/0026-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/patches/server/0026-Kaiiju-Entity-tick-and-removal-limiter.patch b/patches/server/0027-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from patches/server/0026-Kaiiju-Entity-tick-and-removal-limiter.patch rename to patches/server/0027-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/patches/server/0027-Petal-Reduce-sensor-work.patch b/patches/server/0028-Petal-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0027-Petal-Reduce-sensor-work.patch rename to patches/server/0028-Petal-Reduce-sensor-work.patch diff --git a/patches/server/0028-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0029-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from patches/server/0028-Pufferfish-Cache-climbing-check-for-activation.patch rename to patches/server/0029-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/patches/server/0029-Pufferfish-Reduce-chunk-loading-lookups.patch b/patches/server/0030-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0029-Pufferfish-Reduce-chunk-loading-lookups.patch rename to patches/server/0030-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0030-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0031-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch similarity index 100% rename from patches/server/0030-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch rename to patches/server/0031-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.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-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0033-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0032-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0033-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0033-Pufferfish-Optimize-suffocation.patch b/patches/server/0034-Pufferfish-Optimize-suffocation.patch similarity index 100% rename from patches/server/0033-Pufferfish-Optimize-suffocation.patch rename to patches/server/0034-Pufferfish-Optimize-suffocation.patch diff --git a/patches/server/0034-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0035-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 100% rename from patches/server/0034-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0035-Pufferfish-Dynamic-Activation-of-Brain.patch diff --git a/patches/server/0035-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from patches/server/0035-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to patches/server/0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/patches/server/0036-Pufferfish-SIMD-Utilities.patch b/patches/server/0037-Pufferfish-SIMD-Utilities.patch similarity index 100% rename from patches/server/0036-Pufferfish-SIMD-Utilities.patch rename to patches/server/0037-Pufferfish-SIMD-Utilities.patch diff --git a/patches/server/0037-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0038-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0037-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0038-Gale-Variable-entity-wake-up-duration.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-Use-platform-math-functions.patch b/patches/server/0040-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0039-Gale-Use-platform-math-functions.patch rename to patches/server/0040-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0040-Gale-Optimize-noise-generation.patch b/patches/server/0041-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0040-Gale-Optimize-noise-generation.patch rename to patches/server/0041-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0041-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0042-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from patches/server/0041-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to patches/server/0042-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/patches/server/0042-Gale-Replace-throttle-tracker-map-with-optimized-col.patch b/patches/server/0043-Gale-Replace-throttle-tracker-map-with-optimized-col.patch similarity index 100% rename from patches/server/0042-Gale-Replace-throttle-tracker-map-with-optimized-col.patch rename to patches/server/0043-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0043-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0044-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0043-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0044-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0044-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0045-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0044-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0045-Sparkly-Paper-Optimize-canSee-checks.patch diff --git a/patches/server/0045-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/patches/server/0046-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from patches/server/0045-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to patches/server/0046-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/patches/server/0046-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0047-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0046-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0047-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0047-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0048-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch similarity index 100% rename from patches/server/0047-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch rename to patches/server/0048-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch diff --git a/patches/server/0048-Leaf-Skip-event-if-no-listeners.patch b/patches/server/0049-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0048-Leaf-Skip-event-if-no-listeners.patch rename to patches/server/0049-Leaf-Skip-event-if-no-listeners.patch diff --git a/patches/server/0049-Purpur-use-alternative-keep-alive.patch b/patches/server/0050-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0049-Purpur-use-alternative-keep-alive.patch rename to patches/server/0050-Purpur-use-alternative-keep-alive.patch diff --git a/patches/server/0050-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0051-Threaded-region-start-tick-and-finished-tick-event.patch similarity index 100% rename from patches/server/0050-Threaded-region-start-tick-and-finished-tick-event.patch rename to patches/server/0051-Threaded-region-start-tick-and-finished-tick-event.patch diff --git a/patches/server/0051-Fix-MC-2025.patch b/patches/server/0052-Fix-MC-2025.patch similarity index 100% rename from patches/server/0051-Fix-MC-2025.patch rename to patches/server/0052-Fix-MC-2025.patch diff --git a/patches/server/0052-FoliaPR-Add-TPS-From-Region.patch b/patches/server/0053-FoliaPR-Add-TPS-From-Region.patch similarity index 100% rename from patches/server/0052-FoliaPR-Add-TPS-From-Region.patch rename to patches/server/0053-FoliaPR-Add-TPS-From-Region.patch diff --git a/patches/server/0053-Leaves-Fix-color-in-console.patch b/patches/server/0054-Leaves-Fix-color-in-console.patch similarity index 100% rename from patches/server/0053-Leaves-Fix-color-in-console.patch rename to patches/server/0054-Leaves-Fix-color-in-console.patch