From 83c54e313446c8d2811dfb0df00f6d869331f23d Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sat, 22 Mar 2025 20:52:05 +0800 Subject: [PATCH] Use the correct list length while generating tick report --- ...list-length-while-generating-tick-re.patch | 20 +++++++++++++++++++ ...aiiju-Don-t-pathfind-outside-region.patch} | 0 ...ju-Vanilla-end-portal-teleportation.patch} | 0 ...iju-Entity-tick-and-removal-limiter.patch} | 0 ...9-Purpur-Use-alternative-keep-alive.patch} | 0 ...0-Purpur-Lobotomize-stuck-villagers.patch} | 0 ...rpur-Barrels-and-enderchests-6-rows.patch} | 0 ...ch => 0032-Petal-Reduce-sensor-work.patch} | 0 ...Cache-climbing-check-for-activation.patch} | 0 ...erfish-Reduce-chunk-loading-lookups.patch} | 0 ...35-Gale-Use-platform-math-functions.patch} | 0 ...le-Variable-entity-wake-up-duration.patch} | 0 ...kip-entity-move-if-movement-is-zero.patch} | 0 ...ttributes-with-optimized-collection.patch} | 0 ...0039-Gale-Optimize-noise-generation.patch} | 0 ...SparklyPaper-Optimize-canSee-checks.patch} | 0 ...-distanceToSqr-call-in-ServerEntity.patch} | 0 ...Secure-seed-and-matter-seed-command.patch} | 0 ...ss-creating-stats-json-bases-on-pla.patch} | 0 ...rain-maps-with-optimized-collection.patch} | 0 ...vent-zombie-reinforcements-loading-.patch} | 0 ...ntities-in-NearestLivingEntitySenso.patch} | 0 ...-api.patch => 0047-Tick-regions-api.patch} | 0 ...issing-teleportation-apis-for-folia.patch} | 0 ... => 0049-Leaves-Revert-raid-changes.patch} | 0 ...ves-Disable-moved-wrongly-threshold.patch} | 0 ...ect-Collision-Behavior-for-Block-Sh.patch} | 0 ... 0052-Raytracing-tracker-experiment.patch} | 0 28 files changed, 20 insertions(+) create mode 100644 luminol-server/minecraft-patches/features/0025-Use-the-correct-list-length-while-generating-tick-re.patch rename luminol-server/minecraft-patches/features/{0025-Kaiiju-Don-t-pathfind-outside-region.patch => 0026-Kaiiju-Don-t-pathfind-outside-region.patch} (100%) rename luminol-server/minecraft-patches/features/{0026-Kaiiju-Vanilla-end-portal-teleportation.patch => 0027-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%) rename luminol-server/minecraft-patches/features/{0027-Kaiiju-Entity-tick-and-removal-limiter.patch => 0028-Kaiiju-Entity-tick-and-removal-limiter.patch} (100%) rename luminol-server/minecraft-patches/features/{0028-Purpur-Use-alternative-keep-alive.patch => 0029-Purpur-Use-alternative-keep-alive.patch} (100%) rename luminol-server/minecraft-patches/features/{0029-Purpur-Lobotomize-stuck-villagers.patch => 0030-Purpur-Lobotomize-stuck-villagers.patch} (100%) rename luminol-server/minecraft-patches/features/{0030-Purpur-Barrels-and-enderchests-6-rows.patch => 0031-Purpur-Barrels-and-enderchests-6-rows.patch} (100%) rename luminol-server/minecraft-patches/features/{0031-Petal-Reduce-sensor-work.patch => 0032-Petal-Reduce-sensor-work.patch} (100%) rename luminol-server/minecraft-patches/features/{0032-Pufferfish-Cache-climbing-check-for-activation.patch => 0033-Pufferfish-Cache-climbing-check-for-activation.patch} (100%) rename luminol-server/minecraft-patches/features/{0033-Pufferfish-Reduce-chunk-loading-lookups.patch => 0034-Pufferfish-Reduce-chunk-loading-lookups.patch} (100%) rename luminol-server/minecraft-patches/features/{0034-Gale-Use-platform-math-functions.patch => 0035-Gale-Use-platform-math-functions.patch} (100%) rename luminol-server/minecraft-patches/features/{0035-Gale-Variable-entity-wake-up-duration.patch => 0036-Gale-Variable-entity-wake-up-duration.patch} (100%) rename luminol-server/minecraft-patches/features/{0036-Gale-Skip-entity-move-if-movement-is-zero.patch => 0037-Gale-Skip-entity-move-if-movement-is-zero.patch} (100%) rename luminol-server/minecraft-patches/features/{0037-Gale-Replace-AI-attributes-with-optimized-collection.patch => 0038-Gale-Replace-AI-attributes-with-optimized-collection.patch} (100%) rename luminol-server/minecraft-patches/features/{0038-Gale-Optimize-noise-generation.patch => 0039-Gale-Optimize-noise-generation.patch} (100%) rename luminol-server/minecraft-patches/features/{0039-SparklyPaper-Optimize-canSee-checks.patch => 0040-SparklyPaper-Optimize-canSee-checks.patch} (100%) rename luminol-server/minecraft-patches/features/{0040-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch => 0041-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch} (100%) rename luminol-server/minecraft-patches/features/{0041-Leaf-Secure-seed-and-matter-seed-command.patch => 0042-Leaf-Secure-seed-and-matter-seed-command.patch} (100%) rename luminol-server/minecraft-patches/features/{0042-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch => 0043-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch} (100%) rename luminol-server/minecraft-patches/features/{0043-Leaf-Replace-brain-maps-with-optimized-collection.patch => 0044-Leaf-Replace-brain-maps-with-optimized-collection.patch} (100%) rename luminol-server/minecraft-patches/features/{0044-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch => 0045-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch} (100%) rename luminol-server/minecraft-patches/features/{0045-Leaf-Smart-sort-entities-in-NearestLivingEntitySenso.patch => 0046-Leaf-Smart-sort-entities-in-NearestLivingEntitySenso.patch} (100%) rename luminol-server/minecraft-patches/features/{0046-Tick-regions-api.patch => 0047-Tick-regions-api.patch} (100%) rename luminol-server/minecraft-patches/features/{0047-Add-missing-teleportation-apis-for-folia.patch => 0048-Add-missing-teleportation-apis-for-folia.patch} (100%) rename luminol-server/minecraft-patches/features/{0048-Leaves-Revert-raid-changes.patch => 0049-Leaves-Revert-raid-changes.patch} (100%) rename luminol-server/minecraft-patches/features/{0049-Leaves-Disable-moved-wrongly-threshold.patch => 0050-Leaves-Disable-moved-wrongly-threshold.patch} (100%) rename luminol-server/minecraft-patches/features/{0050-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch => 0051-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch} (100%) rename luminol-server/minecraft-patches/features/{0051-Raytracing-tracker-experiment.patch => 0052-Raytracing-tracker-experiment.patch} (100%) diff --git a/luminol-server/minecraft-patches/features/0025-Use-the-correct-list-length-while-generating-tick-re.patch b/luminol-server/minecraft-patches/features/0025-Use-the-correct-list-length-while-generating-tick-re.patch new file mode 100644 index 0000000..44ee80f --- /dev/null +++ b/luminol-server/minecraft-patches/features/0025-Use-the-correct-list-length-while-generating-tick-re.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrHua269 +Date: Sat, 22 Mar 2025 20:48:24 +0800 +Subject: [PATCH] Use the correct list length while generating tick report + + +diff --git a/io/papermc/paper/threadedregions/TickData.java b/io/papermc/paper/threadedregions/TickData.java +index 0383e4dcd611a7568597f46308060f3d7288a564..f53c37d047856f1569b6f637c54ebad03c42006e 100644 +--- a/io/papermc/paper/threadedregions/TickData.java ++++ b/io/papermc/paper/threadedregions/TickData.java +@@ -178,7 +178,8 @@ public final class TickData { + } else { + long totalTickTime = 0L; + long totalCpuTime = 0L; +- for (int k = 0, len2 = collapsedData.size(); k < len2; ++k) { ++ //for (int k = 0, len2 = collapsedData.size(); k < len2; ++k) { ++ for (int k = 0, len2 = toCollapse.size(); k < len2; ++k) { // Luminol - Use the correct list length + final TickRegionScheduler.TickTime time = toCollapse.get(k); + totalTickTime += time.tickLength(); + totalCpuTime += time.supportCPUTime() ? time.tickCpuTime() : 0L; diff --git a/luminol-server/minecraft-patches/features/0025-Kaiiju-Don-t-pathfind-outside-region.patch b/luminol-server/minecraft-patches/features/0026-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0025-Kaiiju-Don-t-pathfind-outside-region.patch rename to luminol-server/minecraft-patches/features/0026-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/luminol-server/minecraft-patches/features/0026-Kaiiju-Vanilla-end-portal-teleportation.patch b/luminol-server/minecraft-patches/features/0027-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0026-Kaiiju-Vanilla-end-portal-teleportation.patch rename to luminol-server/minecraft-patches/features/0027-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/luminol-server/minecraft-patches/features/0027-Kaiiju-Entity-tick-and-removal-limiter.patch b/luminol-server/minecraft-patches/features/0028-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0027-Kaiiju-Entity-tick-and-removal-limiter.patch rename to luminol-server/minecraft-patches/features/0028-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/luminol-server/minecraft-patches/features/0028-Purpur-Use-alternative-keep-alive.patch b/luminol-server/minecraft-patches/features/0029-Purpur-Use-alternative-keep-alive.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0028-Purpur-Use-alternative-keep-alive.patch rename to luminol-server/minecraft-patches/features/0029-Purpur-Use-alternative-keep-alive.patch diff --git a/luminol-server/minecraft-patches/features/0029-Purpur-Lobotomize-stuck-villagers.patch b/luminol-server/minecraft-patches/features/0030-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0029-Purpur-Lobotomize-stuck-villagers.patch rename to luminol-server/minecraft-patches/features/0030-Purpur-Lobotomize-stuck-villagers.patch diff --git a/luminol-server/minecraft-patches/features/0030-Purpur-Barrels-and-enderchests-6-rows.patch b/luminol-server/minecraft-patches/features/0031-Purpur-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0030-Purpur-Barrels-and-enderchests-6-rows.patch rename to luminol-server/minecraft-patches/features/0031-Purpur-Barrels-and-enderchests-6-rows.patch diff --git a/luminol-server/minecraft-patches/features/0031-Petal-Reduce-sensor-work.patch b/luminol-server/minecraft-patches/features/0032-Petal-Reduce-sensor-work.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0031-Petal-Reduce-sensor-work.patch rename to luminol-server/minecraft-patches/features/0032-Petal-Reduce-sensor-work.patch diff --git a/luminol-server/minecraft-patches/features/0032-Pufferfish-Cache-climbing-check-for-activation.patch b/luminol-server/minecraft-patches/features/0033-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0032-Pufferfish-Cache-climbing-check-for-activation.patch rename to luminol-server/minecraft-patches/features/0033-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/luminol-server/minecraft-patches/features/0033-Pufferfish-Reduce-chunk-loading-lookups.patch b/luminol-server/minecraft-patches/features/0034-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0033-Pufferfish-Reduce-chunk-loading-lookups.patch rename to luminol-server/minecraft-patches/features/0034-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/luminol-server/minecraft-patches/features/0034-Gale-Use-platform-math-functions.patch b/luminol-server/minecraft-patches/features/0035-Gale-Use-platform-math-functions.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0034-Gale-Use-platform-math-functions.patch rename to luminol-server/minecraft-patches/features/0035-Gale-Use-platform-math-functions.patch diff --git a/luminol-server/minecraft-patches/features/0035-Gale-Variable-entity-wake-up-duration.patch b/luminol-server/minecraft-patches/features/0036-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0035-Gale-Variable-entity-wake-up-duration.patch rename to luminol-server/minecraft-patches/features/0036-Gale-Variable-entity-wake-up-duration.patch diff --git a/luminol-server/minecraft-patches/features/0036-Gale-Skip-entity-move-if-movement-is-zero.patch b/luminol-server/minecraft-patches/features/0037-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0036-Gale-Skip-entity-move-if-movement-is-zero.patch rename to luminol-server/minecraft-patches/features/0037-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/luminol-server/minecraft-patches/features/0037-Gale-Replace-AI-attributes-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0038-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0037-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0038-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/luminol-server/minecraft-patches/features/0038-Gale-Optimize-noise-generation.patch b/luminol-server/minecraft-patches/features/0039-Gale-Optimize-noise-generation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0038-Gale-Optimize-noise-generation.patch rename to luminol-server/minecraft-patches/features/0039-Gale-Optimize-noise-generation.patch diff --git a/luminol-server/minecraft-patches/features/0039-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/minecraft-patches/features/0040-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0039-SparklyPaper-Optimize-canSee-checks.patch rename to luminol-server/minecraft-patches/features/0040-SparklyPaper-Optimize-canSee-checks.patch diff --git a/luminol-server/minecraft-patches/features/0040-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/luminol-server/minecraft-patches/features/0041-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0040-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to luminol-server/minecraft-patches/features/0041-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/luminol-server/minecraft-patches/features/0041-Leaf-Secure-seed-and-matter-seed-command.patch b/luminol-server/minecraft-patches/features/0042-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0041-Leaf-Secure-seed-and-matter-seed-command.patch rename to luminol-server/minecraft-patches/features/0042-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/luminol-server/minecraft-patches/features/0042-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/luminol-server/minecraft-patches/features/0043-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0042-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch rename to luminol-server/minecraft-patches/features/0043-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch diff --git a/luminol-server/minecraft-patches/features/0043-Leaf-Replace-brain-maps-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0044-Leaf-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0043-Leaf-Replace-brain-maps-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0044-Leaf-Replace-brain-maps-with-optimized-collection.patch diff --git a/luminol-server/minecraft-patches/features/0044-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch b/luminol-server/minecraft-patches/features/0045-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0044-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch rename to luminol-server/minecraft-patches/features/0045-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch diff --git a/luminol-server/minecraft-patches/features/0045-Leaf-Smart-sort-entities-in-NearestLivingEntitySenso.patch b/luminol-server/minecraft-patches/features/0046-Leaf-Smart-sort-entities-in-NearestLivingEntitySenso.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0045-Leaf-Smart-sort-entities-in-NearestLivingEntitySenso.patch rename to luminol-server/minecraft-patches/features/0046-Leaf-Smart-sort-entities-in-NearestLivingEntitySenso.patch diff --git a/luminol-server/minecraft-patches/features/0046-Tick-regions-api.patch b/luminol-server/minecraft-patches/features/0047-Tick-regions-api.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0046-Tick-regions-api.patch rename to luminol-server/minecraft-patches/features/0047-Tick-regions-api.patch diff --git a/luminol-server/minecraft-patches/features/0047-Add-missing-teleportation-apis-for-folia.patch b/luminol-server/minecraft-patches/features/0048-Add-missing-teleportation-apis-for-folia.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0047-Add-missing-teleportation-apis-for-folia.patch rename to luminol-server/minecraft-patches/features/0048-Add-missing-teleportation-apis-for-folia.patch diff --git a/luminol-server/minecraft-patches/features/0048-Leaves-Revert-raid-changes.patch b/luminol-server/minecraft-patches/features/0049-Leaves-Revert-raid-changes.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0048-Leaves-Revert-raid-changes.patch rename to luminol-server/minecraft-patches/features/0049-Leaves-Revert-raid-changes.patch diff --git a/luminol-server/minecraft-patches/features/0049-Leaves-Disable-moved-wrongly-threshold.patch b/luminol-server/minecraft-patches/features/0050-Leaves-Disable-moved-wrongly-threshold.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0049-Leaves-Disable-moved-wrongly-threshold.patch rename to luminol-server/minecraft-patches/features/0050-Leaves-Disable-moved-wrongly-threshold.patch diff --git a/luminol-server/minecraft-patches/features/0050-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch b/luminol-server/minecraft-patches/features/0051-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0050-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch rename to luminol-server/minecraft-patches/features/0051-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch diff --git a/luminol-server/minecraft-patches/features/0051-Raytracing-tracker-experiment.patch b/luminol-server/minecraft-patches/features/0052-Raytracing-tracker-experiment.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0051-Raytracing-tracker-experiment.patch rename to luminol-server/minecraft-patches/features/0052-Raytracing-tracker-experiment.patch