From 1ed71f5812cf8ef57bf713fc5c6d8f90379a3146 Mon Sep 17 00:00:00 2001
From: MrHua269 <wangxyper@163.com>
Date: Tue, 6 Aug 2024 17:55:23 +0800
Subject: [PATCH] Force disable builtin spark plugin

---
 ...1-Force-disable-builtin-spark-plugin.patch | 132 ++++++++++++++++++
 ...aiiju-Don-t-pathfind-outside-region.patch} |   0
 ...ju-Vanilla-end-portal-teleportation.patch} |   0
 ...ch => 0024-Petal-Reduce-sensor-work.patch} |   0
 ...ish-Improve-fluid-direction-caching.patch} |   0
 ...Cache-climbing-check-for-activation.patch} |   0
 ...erfish-Reduce-chunk-loading-lookups.patch} |   0
 ...return-optimization-for-target-find.patch} |   0
 ...per-6045-block-goal-shouldn-t-load-.patch} |   0
 ...erfish-Skip-cloning-loot-parameters.patch} |   0
 ...ish-Reduce-projectile-chunk-loading.patch} |   0
 ...patch => 0032-Pufferfish-Entity-TTL.patch} |   0
 ...ferfish-Dynamic-Activation-of-Brain.patch} |   0
 ...heck-for-spooky-season-once-an-hour.patch} |   0
 ...035-Pufferfish-Optimize-suffocation.patch} |   0
 ...le-goal-selector-during-inactive-ti.patch} |   0
 ...r-ShapelessRecipes-comparison-for-V.patch} |   0
 ...h => 0038-Pufferfish-SIMD-Utilities.patch} |   0
 ...le-Variable-entity-wake-up-duration.patch} |   0
 ...=> 0040-Gale-Optimize-sun-burn-tick.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
 ...-distanceToSqr-call-in-ServerEntity.patch} |   0
 ...I-and-display-of-chunkhot-in-tpsbar.patch} |   2 +-
 ...1-Purpur-use-alternative-keep-alive.patch} |   0
 ...052-Leaf-Skip-event-if-no-listeners.patch} |   0
 ...-start-tick-and-finished-tick-event.patch} |   0
 ...x-MC-2025.patch => 0054-Fix-MC-2025.patch} |   0
 ...=> 0055-FoliaPR-Add-TPS-From-Region.patch} |   2 +-
 35 files changed, 134 insertions(+), 2 deletions(-)
 create mode 100644 patches/server/0021-Force-disable-builtin-spark-plugin.patch
 rename patches/server/{0021-Kaiiju-Don-t-pathfind-outside-region.patch => 0022-Kaiiju-Don-t-pathfind-outside-region.patch} (100%)
 rename patches/server/{0022-Kaiiju-Vanilla-end-portal-teleportation.patch => 0023-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%)
 rename patches/server/{0023-Petal-Reduce-sensor-work.patch => 0024-Petal-Reduce-sensor-work.patch} (100%)
 rename patches/server/{0024-Pufferfish-Improve-fluid-direction-caching.patch => 0025-Pufferfish-Improve-fluid-direction-caching.patch} (100%)
 rename patches/server/{0025-Pufferfish-Cache-climbing-check-for-activation.patch => 0026-Pufferfish-Cache-climbing-check-for-activation.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-Early-return-optimization-for-target-find.patch => 0028-Pufferfish-Early-return-optimization-for-target-find.patch} (100%)
 rename patches/server/{0028-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch => 0029-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch} (100%)
 rename patches/server/{0029-Pufferfish-Skip-cloning-loot-parameters.patch => 0030-Pufferfish-Skip-cloning-loot-parameters.patch} (100%)
 rename patches/server/{0030-Pufferfish-Reduce-projectile-chunk-loading.patch => 0031-Pufferfish-Reduce-projectile-chunk-loading.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-Only-check-for-spooky-season-once-an-hour.patch => 0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch} (100%)
 rename patches/server/{0034-Pufferfish-Optimize-suffocation.patch => 0035-Pufferfish-Optimize-suffocation.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-Simpler-ShapelessRecipes-comparison-for-V.patch => 0037-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch} (100%)
 rename patches/server/{0037-Pufferfish-SIMD-Utilities.patch => 0038-Pufferfish-SIMD-Utilities.patch} (100%)
 rename patches/server/{0038-Gale-Variable-entity-wake-up-duration.patch => 0039-Gale-Variable-entity-wake-up-duration.patch} (100%)
 rename patches/server/{0039-Gale-Optimize-sun-burn-tick.patch => 0040-Gale-Optimize-sun-burn-tick.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-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch => 0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.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} (99%)
 rename patches/server/{0050-Purpur-use-alternative-keep-alive.patch => 0051-Purpur-use-alternative-keep-alive.patch} (100%)
 rename patches/server/{0051-Leaf-Skip-event-if-no-listeners.patch => 0052-Leaf-Skip-event-if-no-listeners.patch} (100%)
 rename patches/server/{0052-Threaded-region-start-tick-and-finished-tick-event.patch => 0053-Threaded-region-start-tick-and-finished-tick-event.patch} (100%)
 rename patches/server/{0053-Fix-MC-2025.patch => 0054-Fix-MC-2025.patch} (100%)
 rename patches/server/{0054-FoliaPR-Add-TPS-From-Region.patch => 0055-FoliaPR-Add-TPS-From-Region.patch} (96%)

diff --git a/patches/server/0021-Force-disable-builtin-spark-plugin.patch b/patches/server/0021-Force-disable-builtin-spark-plugin.patch
new file mode 100644
index 0000000..2248ce4
--- /dev/null
+++ b/patches/server/0021-Force-disable-builtin-spark-plugin.patch
@@ -0,0 +1,132 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <wangxyper@163.com>
+Date: Tue, 6 Aug 2024 17:53:07 +0800
+Subject: [PATCH] Force disable builtin spark plugin
+
+
+diff --git a/src/main/java/io/papermc/paper/plugin/provider/source/FileProviderSource.java b/src/main/java/io/papermc/paper/plugin/provider/source/FileProviderSource.java
+index 48604e7f96adc9e226e034054c5e2bad0b024eb5..99f0c1e4d3437154a1062b0a8f94b7a04dd935af 100644
+--- a/src/main/java/io/papermc/paper/plugin/provider/source/FileProviderSource.java
++++ b/src/main/java/io/papermc/paper/plugin/provider/source/FileProviderSource.java
+@@ -88,7 +88,7 @@ public class FileProviderSource implements ProviderSource<Path, Path> {
+         }
+ 
+         final PluginMeta config = type.getConfig(file);
+-        if ((config.getName().equals("spark") && config.getMainClass().equals("me.lucko.spark.bukkit.BukkitSparkPlugin")) && !SparksFly.isPluginPreferred()) {
++        if ((config.getName().equals("spark") && config.getMainClass().equals("me.lucko.spark.bukkit.BukkitSparkPlugin")) && !SparksFly.isPluginPreferred() && false) { // Luminol - Force disable builtin spark
+             LOGGER.info("The spark plugin will not be loaded as this server bundles the spark profiler.");
+             return;
+         }
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 242d990c55ddd0629eb5e55a7c5c46d6d51beb17..39c5af1e3a4c2abbd02ccc3574d73aa06affcdf2 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -778,8 +778,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         // Paper end - Configurable player collision
+ 
+         this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
+-        this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
+-        this.server.spark.enableAfterPlugins(this.server); // Paper - spark
++        if (false) this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark // Luminol - Force disable builtin spark
++        if (false) this.server.spark.enableAfterPlugins(this.server); // Paper - spark // Luminol - Force disable builtin spark
+         if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
+         io.papermc.paper.command.brigadier.PaperCommands.INSTANCE.setValid(); // Paper - reset invalid state for event fire below
+         io.papermc.paper.plugin.lifecycle.event.LifecycleEventRunner.INSTANCE.callReloadableRegistrarEvent(io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents.COMMANDS, io.papermc.paper.command.brigadier.PaperCommands.INSTANCE, org.bukkit.plugin.Plugin.class, io.papermc.paper.plugin.lifecycle.event.registrar.ReloadableRegistrarEvent.Cause.INITIAL); // Paper - call commands event for regular plugins
+@@ -1093,7 +1093,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         MinecraftServer.LOGGER.info("Stopping server");
+         Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
+         MinecraftTimings.stopServer(); // Paper
+-        this.server.spark.disable(); // Paper - spark
++        if (false) this.server.spark.disable(); // Paper - spark // Luminol - Force disable builtin spark
+         // CraftBukkit start
+         if (this.server != null) {
+             this.server.disablePlugins();
+@@ -1309,7 +1309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             // tasks are default scheduled at -1 + delay, and first tick will tick at 1
+             final long actualDoneTimeMs = System.currentTimeMillis() - org.bukkit.craftbukkit.Main.BOOT_TIME.toEpochMilli(); // Paper - Add total time
+             LOGGER.info("Done ({})! For help, type \"help\"", String.format(java.util.Locale.ROOT, "%.3fs", actualDoneTimeMs / 1000.00D)); // Paper - Add total time
+-            this.server.spark.enableBeforePlugins(); // Paper - spark
++            if (false) this.server.spark.enableBeforePlugins(); // Paper - spark // Luminol - Force disable builtin spark
+             org.spigotmc.WatchdogThread.tick();
+             // Paper end - Improved Watchdog Support
+             org.spigotmc.WatchdogThread.hasStarted = true; // Paper
+@@ -1673,7 +1673,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         BooleanSupplier shouldKeepTicking = () -> {
+             return scheduledEnd - System.nanoTime() > targetBuffer;
+         };
+-        this.server.spark.tickStart(); // Paper - spark
++        if (false)this.server.spark.tickStart(); // Paper - spark // Luminol - Force disable builtin spark
+         new com.destroystokyo.paper.event.server.ServerTickStartEvent((int)region.getCurrentTick()).callEvent(); // Paper
+         // Folia end - region threading
+         co.aikar.timings.TimingsManager.FULL_SERVER_TICK.startTiming(); // Paper
+@@ -1759,7 +1759,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         long endTime = System.nanoTime();
+         long remaining = scheduledEnd - endTime; // Folia - region ticking
+         new com.destroystokyo.paper.event.server.ServerTickEndEvent((int)io.papermc.paper.threadedregions.RegionizedServer.getCurrentTick(), ((double)(endTime - startTime) / 1000000D), remaining).callEvent(); // Folia - region ticking
+-        this.server.spark.tickEnd(((double)(endTime - startTime) / 1000000D)); // Paper - spark // Folia - region ticking
++        if (false) this.server.spark.tickEnd(((double)(endTime - startTime) / 1000000D)); // Paper - spark // Folia - region ticking // Luminol - Force disable builtin spark
+         // Paper end - Server Tick Events
+         this.profiler.push("tallying");
+         // Folia - region threading
+diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+index 79b79a5d41dc3568ae6a3d7701e6ac6b91045e36..cd28f741343c443ff4728fc0aa5526b6d66d2d9b 100644
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -228,7 +228,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         // Paper end - initialize global and world-defaults configuration
+         me.earthme.luminol.config.LuminolConfig.loadConfig(); //Luminol - load config file
+         me.earthme.luminol.config.LuminolConfig.setupLatch(); //Luminol - load config file
+-        this.server.spark.enableEarlyIfRequested(); // Paper - spark
++        if (false) this.server.spark.enableEarlyIfRequested(); // Paper - spark // Luminol - Force disable builtin spark
+         // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
+         if (this.convertOldUsers()) {
+             this.getProfileCache().save(false); // Paper
+@@ -238,7 +238,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash); // Paper - start watchdog thread
+         thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
+         io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
+-        this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
++        if (false) this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark // Luminol - Force disable builtin spark
+         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
+         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
+ 
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index 60b10a6e1fcc06430c5cacd4c49d92e1de6e4778..050ec65f1b488677781b74b824b5b5dde184c7e0 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -309,7 +309,7 @@ public final class CraftServer implements Server {
+     public static Exception excessiveVelEx; // Paper - Velocity warnings
+     private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
+     private final io.papermc.paper.potion.PaperPotionBrewer potionBrewer; // Paper - Custom Potion Mixes
+-    public final io.papermc.paper.SparksFly spark; // Paper - spark
++    public io.papermc.paper.SparksFly spark; // Paper - spark // Luminol - Force disable builtin spark
+ 
+     // Paper start - Folia region threading API
+     private final io.papermc.paper.threadedregions.scheduler.FoliaRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaRegionScheduler(); // Folia - region threading
+@@ -481,7 +481,7 @@ public final class CraftServer implements Server {
+         }
+         this.potionBrewer = new io.papermc.paper.potion.PaperPotionBrewer(console); // Paper - custom potion mixes
+         datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
+-        this.spark = new io.papermc.paper.SparksFly(this); // Paper - spark
++        if (false) this.spark = new io.papermc.paper.SparksFly(this); // Paper - spark // Luminol - Force disable builtin spark
+     }
+ 
+     public boolean getCommandBlockOverride(String command) {
+@@ -1144,7 +1144,7 @@ public final class CraftServer implements Server {
+         this.reloadData();
+         org.spigotmc.SpigotConfig.registerCommands(); // Spigot
+         io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
+-        this.spark.registerCommandBeforePlugins(this); // Paper - spark
++        if (false) this.spark.registerCommandBeforePlugins(this); // Paper - spark // Luminol - Force disable builtin spark
+         this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
+         this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
+ 
+@@ -1173,7 +1173,7 @@ public final class CraftServer implements Server {
+         this.loadPlugins();
+         this.enablePlugins(PluginLoadOrder.STARTUP);
+         this.enablePlugins(PluginLoadOrder.POSTWORLD);
+-        this.spark.registerCommandAfterPlugins(this); // Paper - spark
++        if (false) this.spark.registerCommandAfterPlugins(this); // Paper - spark // Luminol - Force disable builtin spark
+         if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
+         // Paper start - brigadier command API
+         io.papermc.paper.command.brigadier.PaperCommands.INSTANCE.setValid(); // to clear invalid state for event fire below
diff --git a/patches/server/0021-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0022-Kaiiju-Don-t-pathfind-outside-region.patch
similarity index 100%
rename from patches/server/0021-Kaiiju-Don-t-pathfind-outside-region.patch
rename to patches/server/0022-Kaiiju-Don-t-pathfind-outside-region.patch
diff --git a/patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0023-Kaiiju-Vanilla-end-portal-teleportation.patch
similarity index 100%
rename from patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch
rename to patches/server/0023-Kaiiju-Vanilla-end-portal-teleportation.patch
diff --git a/patches/server/0023-Petal-Reduce-sensor-work.patch b/patches/server/0024-Petal-Reduce-sensor-work.patch
similarity index 100%
rename from patches/server/0023-Petal-Reduce-sensor-work.patch
rename to patches/server/0024-Petal-Reduce-sensor-work.patch
diff --git a/patches/server/0024-Pufferfish-Improve-fluid-direction-caching.patch b/patches/server/0025-Pufferfish-Improve-fluid-direction-caching.patch
similarity index 100%
rename from patches/server/0024-Pufferfish-Improve-fluid-direction-caching.patch
rename to patches/server/0025-Pufferfish-Improve-fluid-direction-caching.patch
diff --git a/patches/server/0025-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0026-Pufferfish-Cache-climbing-check-for-activation.patch
similarity index 100%
rename from patches/server/0025-Pufferfish-Cache-climbing-check-for-activation.patch
rename to patches/server/0026-Pufferfish-Cache-climbing-check-for-activation.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-Early-return-optimization-for-target-find.patch b/patches/server/0028-Pufferfish-Early-return-optimization-for-target-find.patch
similarity index 100%
rename from patches/server/0027-Pufferfish-Early-return-optimization-for-target-find.patch
rename to patches/server/0028-Pufferfish-Early-return-optimization-for-target-find.patch
diff --git a/patches/server/0028-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0029-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch
similarity index 100%
rename from patches/server/0028-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch
rename to patches/server/0029-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch
diff --git a/patches/server/0029-Pufferfish-Skip-cloning-loot-parameters.patch b/patches/server/0030-Pufferfish-Skip-cloning-loot-parameters.patch
similarity index 100%
rename from patches/server/0029-Pufferfish-Skip-cloning-loot-parameters.patch
rename to patches/server/0030-Pufferfish-Skip-cloning-loot-parameters.patch
diff --git a/patches/server/0030-Pufferfish-Reduce-projectile-chunk-loading.patch b/patches/server/0031-Pufferfish-Reduce-projectile-chunk-loading.patch
similarity index 100%
rename from patches/server/0030-Pufferfish-Reduce-projectile-chunk-loading.patch
rename to patches/server/0031-Pufferfish-Reduce-projectile-chunk-loading.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-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch
similarity index 100%
rename from patches/server/0033-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch
rename to patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch
diff --git a/patches/server/0034-Pufferfish-Optimize-suffocation.patch b/patches/server/0035-Pufferfish-Optimize-suffocation.patch
similarity index 100%
rename from patches/server/0034-Pufferfish-Optimize-suffocation.patch
rename to patches/server/0035-Pufferfish-Optimize-suffocation.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-Simpler-ShapelessRecipes-comparison-for-V.patch b/patches/server/0037-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch
similarity index 100%
rename from patches/server/0036-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch
rename to patches/server/0037-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch
diff --git a/patches/server/0037-Pufferfish-SIMD-Utilities.patch b/patches/server/0038-Pufferfish-SIMD-Utilities.patch
similarity index 100%
rename from patches/server/0037-Pufferfish-SIMD-Utilities.patch
rename to patches/server/0038-Pufferfish-SIMD-Utilities.patch
diff --git a/patches/server/0038-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0039-Gale-Variable-entity-wake-up-duration.patch
similarity index 100%
rename from patches/server/0038-Gale-Variable-entity-wake-up-duration.patch
rename to patches/server/0039-Gale-Variable-entity-wake-up-duration.patch
diff --git a/patches/server/0039-Gale-Optimize-sun-burn-tick.patch b/patches/server/0040-Gale-Optimize-sun-burn-tick.patch
similarity index 100%
rename from patches/server/0039-Gale-Optimize-sun-burn-tick.patch
rename to patches/server/0040-Gale-Optimize-sun-burn-tick.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-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch
similarity index 100%
rename from patches/server/0048-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch
rename to patches/server/0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.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 99%
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
index 810474a..6f2fdcc 100644
--- 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
@@ -179,7 +179,7 @@ index e456c54b4ac3906a0a0310bdfba5ef39dc02c4ef..0c6ae960cc1d1a39f625295f649169d3
          if (mspt == -1){
              return BossBar.Color.valueOf(TpsBarConfig.tpsColors.get(3));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 242d990c55ddd0629eb5e55a7c5c46d6d51beb17..4454fce84738c03af36075f2376e02ded77ebe22 100644
+index 39c5af1e3a4c2abbd02ccc3574d73aa06affcdf2..97ca9a33a369d9f6f44c99fae72f11a730f2f213 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1717,6 +1717,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
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-Leaf-Skip-event-if-no-listeners.patch b/patches/server/0052-Leaf-Skip-event-if-no-listeners.patch
similarity index 100%
rename from patches/server/0051-Leaf-Skip-event-if-no-listeners.patch
rename to patches/server/0052-Leaf-Skip-event-if-no-listeners.patch
diff --git a/patches/server/0052-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0053-Threaded-region-start-tick-and-finished-tick-event.patch
similarity index 100%
rename from patches/server/0052-Threaded-region-start-tick-and-finished-tick-event.patch
rename to patches/server/0053-Threaded-region-start-tick-and-finished-tick-event.patch
diff --git a/patches/server/0053-Fix-MC-2025.patch b/patches/server/0054-Fix-MC-2025.patch
similarity index 100%
rename from patches/server/0053-Fix-MC-2025.patch
rename to patches/server/0054-Fix-MC-2025.patch
diff --git a/patches/server/0054-FoliaPR-Add-TPS-From-Region.patch b/patches/server/0055-FoliaPR-Add-TPS-From-Region.patch
similarity index 96%
rename from patches/server/0054-FoliaPR-Add-TPS-From-Region.patch
rename to patches/server/0055-FoliaPR-Add-TPS-From-Region.patch
index 1ca066a..e13e70d 100644
--- a/patches/server/0054-FoliaPR-Add-TPS-From-Region.patch
+++ b/patches/server/0055-FoliaPR-Add-TPS-From-Region.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] FoliaPR Add TPS From Region
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 60b10a6e1fcc06430c5cacd4c49d92e1de6e4778..956207ae37269884ba2852123c6503fcc2e0b9ba 100644
+index 050ec65f1b488677781b74b824b5b5dde184c7e0..2d53fe0a34ccfdeac159d2912f062a5aea1e3717 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -3071,6 +3071,42 @@ public final class CraftServer implements Server {