From 9121c2ba4e27fca165b5e8de4af96391fd80d71e Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sat, 15 Jun 2024 13:01:48 +0000 Subject: [PATCH] Added a simple membar --- .../0010-Add-a-simple-membar.patch} | 12 ++++++------ ...atch => 0011-Add-config-for-username-check.patch} | 0 ...> 0012-Add-config-for-offline-mode-warning.patch} | 2 +- ...13-Add-config-for-out-of-order-chat-checks.patch} | 0 ...014-Add-a-simple-watchdog-for-tick-regions.patch} | 0 ...015-Try-fixing-folia-spector-teleportation.patch} | 4 ++-- ...sync-if-entity-was-moving-to-another-regio.patch} | 0 ...ixing-folia-off-region-POI-accessing-issue.patch} | 0 ...leportAsync-calling-during-moving-event-be.patch} | 4 ++-- ... 0019-Kaiiju-Don-t-pathfind-outside-region.patch} | 0 ...20-Kaiiju-Vanilla-end-portal-teleportation.patch} | 0 ...ork.patch => 0021-Petal-Reduce-sensor-work.patch} | 0 ...-Pufferfish-Optimize-entity-coordinate-key.patch} | 0 ...erfish-Cache-climbing-check-for-activation.patch} | 0 ...Pufferfish-Improve-fluid-direction-caching.patch} | 0 ...ch => 0025-Pufferfish-Optimize-suffocation.patch} | 0 ...-Early-return-optimization-for-target-find.patch} | 0 ...27-Pufferfish-Reduce-chunk-loading-lookups.patch} | 0 ...-Fix-Paper-6045-block-goal-shouldn-t-load-.patch} | 0 ...h-Reduce-entity-fluid-lookups-if-no-fluids.patch} | 0 ...-Only-check-for-spooky-season-once-an-hour.patch} | 0 ...ty-TTL.patch => 0031-Pufferfish-Entity-TTL.patch} | 0 ...Pufferfish-Reduce-projectile-chunk-loading.patch} | 0 ...033-Pufferfish-Dynamic-Activation-of-Brain.patch} | 0 ...-Throttle-goal-selector-during-inactive-ti.patch} | 0 ... 0035-Pufferfish-Reduce-entity-allocations.patch} | 0 ...h-Improve-container-checking-with-a-bitset.patch} | 0 ...0037-Gale-Variable-entity-wake-up-duration.patch} | 0 ...-load-chunks-to-activate-climbing-entities.patch} | 0 ....patch => 0039-Gale-Optimize-sun-burn-tick.patch} | 0 ...le-Check-frozen-ticks-before-landing-block.patch} | 0 ...-trigger-lootable-refresh-for-non-player-i.patch} | 0 ...h => 0042-Gale-Use-platform-math-functions.patch} | 0 ...-Gale-Skip-entity-move-if-movement-is-zero.patch} | 0 ...ize-world-generation-chunk-and-block-acces.patch} | 0 ...tch => 0045-Gale-Optimize-noise-generation.patch} | 0 ...ch => 0046-Gale-Faster-chunk-serialization.patch} | 0 ...e-lambda-and-Optional-allocation-in-Entity.patch} | 0 ...ce-throttle-tracker-map-with-optimized-col.patch} | 0 ... 0049-Sparkly-Paper-Optimize-canSee-checks.patch} | 0 ...-region-start-tick-and-finished-tick-event.patch} | 0 ... => 0051-Purpur-use-alternative-keep-alive.patch} | 0 ...0051-Fix-MC-2025.patch => 0052-Fix-MC-2025.patch} | 0 ...CG-Chunk-API.patch => 0053-KioCG-Chunk-API.patch} | 6 +++--- ...bar.patch => 0054-Added-chunkhot-to-tpsbar.patch} | 0 45 files changed, 14 insertions(+), 14 deletions(-) rename patches/{unapplied/server/0054-Added-a-simple-membar.patch => server/0010-Add-a-simple-membar.patch} (96%) rename patches/server/{0010-Add-config-for-username-check.patch => 0011-Add-config-for-username-check.patch} (100%) rename patches/server/{0011-Add-config-for-offline-mode-warning.patch => 0012-Add-config-for-offline-mode-warning.patch} (96%) rename patches/server/{0012-Add-config-for-out-of-order-chat-checks.patch => 0013-Add-config-for-out-of-order-chat-checks.patch} (100%) rename patches/server/{0013-Add-a-simple-watchdog-for-tick-regions.patch => 0014-Add-a-simple-watchdog-for-tick-regions.patch} (100%) rename patches/server/{0014-Try-fixing-folia-spector-teleportation.patch => 0015-Try-fixing-folia-spector-teleportation.patch} (93%) rename patches/server/{0015-Teleport-async-if-entity-was-moving-to-another-regio.patch => 0016-Teleport-async-if-entity-was-moving-to-another-regio.patch} (100%) rename patches/server/{0016-Try-fixing-folia-off-region-POI-accessing-issue.patch => 0017-Try-fixing-folia-off-region-POI-accessing-issue.patch} (100%) rename patches/server/{0017-Prevent-teleportAsync-calling-during-moving-event-be.patch => 0018-Prevent-teleportAsync-calling-during-moving-event-be.patch} (98%) rename patches/server/{0018-Kaiiju-Don-t-pathfind-outside-region.patch => 0019-Kaiiju-Don-t-pathfind-outside-region.patch} (100%) rename patches/server/{0019-Kaiiju-Vanilla-end-portal-teleportation.patch => 0020-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%) rename patches/server/{0020-Petal-Reduce-sensor-work.patch => 0021-Petal-Reduce-sensor-work.patch} (100%) rename patches/server/{0021-Pufferfish-Optimize-entity-coordinate-key.patch => 0022-Pufferfish-Optimize-entity-coordinate-key.patch} (100%) rename patches/server/{0022-Pufferfish-Cache-climbing-check-for-activation.patch => 0023-Pufferfish-Cache-climbing-check-for-activation.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-Entity-TTL.patch => 0031-Pufferfish-Entity-TTL.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-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-Check-frozen-ticks-before-landing-block.patch => 0040-Gale-Check-frozen-ticks-before-landing-block.patch} (100%) rename patches/server/{0040-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch => 0041-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.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-world-generation-chunk-and-block-acces.patch => 0044-Gale-Optimize-world-generation-chunk-and-block-acces.patch} (100%) rename patches/server/{0044-Gale-Optimize-noise-generation.patch => 0045-Gale-Optimize-noise-generation.patch} (100%) rename patches/server/{0045-Gale-Faster-chunk-serialization.patch => 0046-Gale-Faster-chunk-serialization.patch} (100%) rename patches/server/{0046-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch => 0047-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch} (100%) rename patches/server/{0047-Gale-Replace-throttle-tracker-map-with-optimized-col.patch => 0048-Gale-Replace-throttle-tracker-map-with-optimized-col.patch} (100%) rename patches/server/{0048-Sparkly-Paper-Optimize-canSee-checks.patch => 0049-Sparkly-Paper-Optimize-canSee-checks.patch} (100%) rename patches/server/{0049-Threaded-region-start-tick-and-finished-tick-event.patch => 0050-Threaded-region-start-tick-and-finished-tick-event.patch} (100%) rename patches/server/{0050-Purpur-use-alternative-keep-alive.patch => 0051-Purpur-use-alternative-keep-alive.patch} (100%) rename patches/server/{0051-Fix-MC-2025.patch => 0052-Fix-MC-2025.patch} (100%) rename patches/server/{0052-KioCG-Chunk-API.patch => 0053-KioCG-Chunk-API.patch} (98%) rename patches/server/{0053-Added-chunkhot-to-tpsbar.patch => 0054-Added-chunkhot-to-tpsbar.patch} (100%) diff --git a/patches/unapplied/server/0054-Added-a-simple-membar.patch b/patches/server/0010-Add-a-simple-membar.patch similarity index 96% rename from patches/unapplied/server/0054-Added-a-simple-membar.patch rename to patches/server/0010-Add-a-simple-membar.patch index 69a08ec..961478a 100644 --- a/patches/unapplied/server/0054-Added-a-simple-membar.patch +++ b/patches/server/0010-Add-a-simple-membar.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 2 Jun 2024 12:18:05 +0000 -Subject: [PATCH] Added a simple membar +Subject: [PATCH] Add a simple membar diff --git a/src/main/java/me/earthme/luminol/commands/MembarCommand.java b/src/main/java/me/earthme/luminol/commands/MembarCommand.java @@ -115,7 +115,7 @@ index 0000000000000000000000000000000000000000..b632c4a636974535bf001f010de1dcb6 +} diff --git a/src/main/java/me/earthme/luminol/functions/GlobalServerMemoryBar.java b/src/main/java/me/earthme/luminol/functions/GlobalServerMemoryBar.java new file mode 100644 -index 0000000000000000000000000000000000000000..1c1278976fd13c1616973c70fe5db2652fcbad95 +index 0000000000000000000000000000000000000000..a33a45194273cc1b4e4157a5449c7994968a3480 --- /dev/null +++ b/src/main/java/me/earthme/luminol/functions/GlobalServerMemoryBar.java @@ -0,0 +1,186 @@ @@ -276,7 +276,7 @@ index 0000000000000000000000000000000000000000..1c1278976fd13c1616973c70fe5db265 + final String content = "<%s>"; + final String replaced = String.format(content,colorString,colorString); + -+ return MiniMessage.miniMessage().deserialize(replaced,Placeholder.parsed("text", String.valueOf(max))); ++ return MiniMessage.miniMessage().deserialize(replaced,Placeholder.parsed("text", String.format("%.2f", (double)max / (1024 * 1024)))); + } + + private static @NotNull Component getMemoryComponent(long used,long max){ @@ -286,7 +286,7 @@ index 0000000000000000000000000000000000000000..1c1278976fd13c1616973c70fe5db265 + final String content = "<%s>"; + final String replaced = String.format(content,colorString,colorString); + -+ return MiniMessage.miniMessage().deserialize(replaced,Placeholder.parsed("text", String.valueOf(used / 1024 * 1024))); ++ return MiniMessage.miniMessage().deserialize(replaced,Placeholder.parsed("text", String.format("%.2f", (double)used / (1024 * 1024)))); + } + + private static BossBar.Color barColorFromMemory(double memPercent){ @@ -306,7 +306,7 @@ index 0000000000000000000000000000000000000000..1c1278976fd13c1616973c70fe5db265 + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 6f86f25efbd4e6e79476c1563dc8f4c114c10695..67f1205ec362bbb191b642641c45c7bcc53c7625 100644 +index 09bde51d3da062c5788151c15c448eaf2a02ea1b..dcdfc70e6c9b021b941a667f288ea09e3c1935e2 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -851,6 +851,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -318,7 +318,7 @@ index 6f86f25efbd4e6e79476c1563dc8f4c114c10695..67f1205ec362bbb191b642641c45c7bc //Util.shutdownExecutors(); // Paper - moved into super SkullBlockEntity.clear(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c04058a95dc4990cd8034b381f95affcdc77dd93..71bc115203933f3992315caf4e10ec8dc44955ba 100644 +index db32beabfa7ba17b1c46d36fa1dc27bc20e06feb..25bdaec097572ee58432516ae5983f4841587046 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -303,6 +303,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0010-Add-config-for-username-check.patch b/patches/server/0011-Add-config-for-username-check.patch similarity index 100% rename from patches/server/0010-Add-config-for-username-check.patch rename to patches/server/0011-Add-config-for-username-check.patch diff --git a/patches/server/0011-Add-config-for-offline-mode-warning.patch b/patches/server/0012-Add-config-for-offline-mode-warning.patch similarity index 96% rename from patches/server/0011-Add-config-for-offline-mode-warning.patch rename to patches/server/0012-Add-config-for-offline-mode-warning.patch index c31218e..fd17fc5 100644 --- a/patches/server/0011-Add-config-for-offline-mode-warning.patch +++ b/patches/server/0012-Add-config-for-offline-mode-warning.patch @@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..502b93c7bda9e8577a1901a8777b7cf9 + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 09bde51d3da062c5788151c15c448eaf2a02ea1b..6f86f25efbd4e6e79476c1563dc8f4c114c10695 100644 +index dcdfc70e6c9b021b941a667f288ea09e3c1935e2..67f1205ec362bbb191b642641c45c7bcc53c7625 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -294,7 +294,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0012-Add-config-for-out-of-order-chat-checks.patch b/patches/server/0013-Add-config-for-out-of-order-chat-checks.patch similarity index 100% rename from patches/server/0012-Add-config-for-out-of-order-chat-checks.patch rename to patches/server/0013-Add-config-for-out-of-order-chat-checks.patch diff --git a/patches/server/0013-Add-a-simple-watchdog-for-tick-regions.patch b/patches/server/0014-Add-a-simple-watchdog-for-tick-regions.patch similarity index 100% rename from patches/server/0013-Add-a-simple-watchdog-for-tick-regions.patch rename to patches/server/0014-Add-a-simple-watchdog-for-tick-regions.patch diff --git a/patches/server/0014-Try-fixing-folia-spector-teleportation.patch b/patches/server/0015-Try-fixing-folia-spector-teleportation.patch similarity index 93% rename from patches/server/0014-Try-fixing-folia-spector-teleportation.patch rename to patches/server/0015-Try-fixing-folia-spector-teleportation.patch index dc9b0be..540706f 100644 --- a/patches/server/0014-Try-fixing-folia-spector-teleportation.patch +++ b/patches/server/0015-Try-fixing-folia-spector-teleportation.patch @@ -36,10 +36,10 @@ index 0000000000000000000000000000000000000000..01f8c6ff3662569be5a4ff998bcd4fbb + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index db32beabfa7ba17b1c46d36fa1dc27bc20e06feb..20f8c9bfdde62f1572e22319ebb752d12d9d5bac 100644 +index 25bdaec097572ee58432516ae5983f4841587046..4286420c207aa8920ae2966874b27aa81cbbc468 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -892,6 +892,11 @@ public class ServerPlayer extends Player { +@@ -893,6 +893,11 @@ public class ServerPlayer extends Player { } Entity entity = this.getCamera(); diff --git a/patches/server/0015-Teleport-async-if-entity-was-moving-to-another-regio.patch b/patches/server/0016-Teleport-async-if-entity-was-moving-to-another-regio.patch similarity index 100% rename from patches/server/0015-Teleport-async-if-entity-was-moving-to-another-regio.patch rename to patches/server/0016-Teleport-async-if-entity-was-moving-to-another-regio.patch diff --git a/patches/server/0016-Try-fixing-folia-off-region-POI-accessing-issue.patch b/patches/server/0017-Try-fixing-folia-off-region-POI-accessing-issue.patch similarity index 100% rename from patches/server/0016-Try-fixing-folia-off-region-POI-accessing-issue.patch rename to patches/server/0017-Try-fixing-folia-off-region-POI-accessing-issue.patch diff --git a/patches/server/0017-Prevent-teleportAsync-calling-during-moving-event-be.patch b/patches/server/0018-Prevent-teleportAsync-calling-during-moving-event-be.patch similarity index 98% rename from patches/server/0017-Prevent-teleportAsync-calling-during-moving-event-be.patch rename to patches/server/0018-Prevent-teleportAsync-calling-during-moving-event-be.patch index 055d6fa..2417e6c 100644 --- a/patches/server/0017-Prevent-teleportAsync-calling-during-moving-event-be.patch +++ b/patches/server/0018-Prevent-teleportAsync-calling-during-moving-event-be.patch @@ -35,10 +35,10 @@ index 0000000000000000000000000000000000000000..8f1449545d6d217b46a9ffae705123da + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 20f8c9bfdde62f1572e22319ebb752d12d9d5bac..24f4370b35d2cc50340de36d81b6c6d9aa250e4c 100644 +index 4286420c207aa8920ae2966874b27aa81cbbc468..eeb89cfdaf0fee522f0ff1eac43dfd85de329b9a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -347,6 +347,10 @@ public class ServerPlayer extends Player { +@@ -348,6 +348,10 @@ public class ServerPlayer extends Player { public double lastEntitySpawnRadiusSquared = -1.0; // Paper end - optimise chunk tick iteration diff --git a/patches/server/0018-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0019-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0018-Kaiiju-Don-t-pathfind-outside-region.patch rename to patches/server/0019-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0019-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0020-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from patches/server/0019-Kaiiju-Vanilla-end-portal-teleportation.patch rename to patches/server/0020-Kaiiju-Vanilla-end-portal-teleportation.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-Optimize-entity-coordinate-key.patch b/patches/server/0022-Pufferfish-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0021-Pufferfish-Optimize-entity-coordinate-key.patch rename to patches/server/0022-Pufferfish-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0022-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0023-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from patches/server/0022-Pufferfish-Cache-climbing-check-for-activation.patch rename to patches/server/0023-Pufferfish-Cache-climbing-check-for-activation.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-Entity-TTL.patch b/patches/server/0031-Pufferfish-Entity-TTL.patch similarity index 100% rename from patches/server/0030-Pufferfish-Entity-TTL.patch rename to patches/server/0031-Pufferfish-Entity-TTL.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-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-Check-frozen-ticks-before-landing-block.patch b/patches/server/0040-Gale-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0039-Gale-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0040-Gale-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0040-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch b/patches/server/0041-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch similarity index 100% rename from patches/server/0040-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch rename to patches/server/0041-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.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-world-generation-chunk-and-block-acces.patch b/patches/server/0044-Gale-Optimize-world-generation-chunk-and-block-acces.patch similarity index 100% rename from patches/server/0043-Gale-Optimize-world-generation-chunk-and-block-acces.patch rename to patches/server/0044-Gale-Optimize-world-generation-chunk-and-block-acces.patch diff --git a/patches/server/0044-Gale-Optimize-noise-generation.patch b/patches/server/0045-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0044-Gale-Optimize-noise-generation.patch rename to patches/server/0045-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0045-Gale-Faster-chunk-serialization.patch b/patches/server/0046-Gale-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0045-Gale-Faster-chunk-serialization.patch rename to patches/server/0046-Gale-Faster-chunk-serialization.patch diff --git a/patches/server/0046-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0047-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from patches/server/0046-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to patches/server/0047-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/patches/server/0047-Gale-Replace-throttle-tracker-map-with-optimized-col.patch b/patches/server/0048-Gale-Replace-throttle-tracker-map-with-optimized-col.patch similarity index 100% rename from patches/server/0047-Gale-Replace-throttle-tracker-map-with-optimized-col.patch rename to patches/server/0048-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0048-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0049-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0048-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0049-Sparkly-Paper-Optimize-canSee-checks.patch diff --git a/patches/server/0049-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0050-Threaded-region-start-tick-and-finished-tick-event.patch similarity index 100% rename from patches/server/0049-Threaded-region-start-tick-and-finished-tick-event.patch rename to patches/server/0050-Threaded-region-start-tick-and-finished-tick-event.patch diff --git a/patches/server/0050-Purpur-use-alternative-keep-alive.patch b/patches/server/0051-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0050-Purpur-use-alternative-keep-alive.patch rename to patches/server/0051-Purpur-use-alternative-keep-alive.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-KioCG-Chunk-API.patch b/patches/server/0053-KioCG-Chunk-API.patch similarity index 98% rename from patches/server/0052-KioCG-Chunk-API.patch rename to patches/server/0053-KioCG-Chunk-API.patch index fe63c93..59937df 100644 --- a/patches/server/0052-KioCG-Chunk-API.patch +++ b/patches/server/0053-KioCG-Chunk-API.patch @@ -183,10 +183,10 @@ index 12c46e7a3f6a8675921d95dee97ece4a83252282..573cca66b905c5decb0e59c58cfa861d } else { passenger.stopRiding(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 24f4370b35d2cc50340de36d81b6c6d9aa250e4c..c04058a95dc4990cd8034b381f95affcdc77dd93 100644 +index eeb89cfdaf0fee522f0ff1eac43dfd85de329b9a..71bc115203933f3992315caf4e10ec8dc44955ba 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -351,6 +351,25 @@ public class ServerPlayer extends Player { +@@ -352,6 +352,25 @@ public class ServerPlayer extends Player { public boolean handlingMoveEvent = false; //Luminol end @@ -212,7 +212,7 @@ index 24f4370b35d2cc50340de36d81b6c6d9aa250e4c..c04058a95dc4990cd8034b381f95affc public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) { super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); this.chatVisibility = ChatVisiblity.FULL; -@@ -923,6 +942,12 @@ public class ServerPlayer extends Player { +@@ -924,6 +943,12 @@ public class ServerPlayer extends Player { this.trackEnteredOrExitedLavaOnVehicle(); this.updatePlayerAttributes(); this.advancements.flushDirty(this); diff --git a/patches/server/0053-Added-chunkhot-to-tpsbar.patch b/patches/server/0054-Added-chunkhot-to-tpsbar.patch similarity index 100% rename from patches/server/0053-Added-chunkhot-to-tpsbar.patch rename to patches/server/0054-Added-chunkhot-to-tpsbar.patch