diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cb994e2..b99c1a5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ shadow = "8.1.1"
 paperweight = "1.7.1"
 paperclip = "3.0.3"
 decompiler = "1.10.1"
-remapper = "0.10.1"
+remapper = "0.10.3"
 
 [libraries]
 remapper = { group = "net.fabricmc", name = "tiny-remapper", version.ref="remapper" }
diff --git a/patches/server/0010-Always-agree-EULA-on-development-mode.patch b/patches/server/0009-Always-agree-EULA-on-development-mode.patch
similarity index 100%
rename from patches/server/0010-Always-agree-EULA-on-development-mode.patch
rename to patches/server/0009-Always-agree-EULA-on-development-mode.patch
diff --git a/patches/server/0011-Add-more-metrics.patch b/patches/server/0010-Add-more-metrics.patch
similarity index 100%
rename from patches/server/0011-Add-more-metrics.patch
rename to patches/server/0010-Add-more-metrics.patch
diff --git a/patches/server/0012-Optimize-default-configurations.patch b/patches/server/0011-Optimize-default-configurations.patch
similarity index 100%
rename from patches/server/0012-Optimize-default-configurations.patch
rename to patches/server/0011-Optimize-default-configurations.patch
diff --git a/patches/server/0013-Add-an-option-to-apply-the-configuration-to-the-vani.patch b/patches/server/0012-Add-an-option-to-apply-the-configuration-to-the-vani.patch
similarity index 100%
rename from patches/server/0013-Add-an-option-to-apply-the-configuration-to-the-vani.patch
rename to patches/server/0012-Add-an-option-to-apply-the-configuration-to-the-vani.patch
diff --git a/patches/server/0014-Tweak-console-logging.patch b/patches/server/0013-Tweak-console-logging.patch
similarity index 90%
rename from patches/server/0014-Tweak-console-logging.patch
rename to patches/server/0013-Tweak-console-logging.patch
index e5172d1..95b7292 100644
--- a/patches/server/0014-Tweak-console-logging.patch
+++ b/patches/server/0013-Tweak-console-logging.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Tweak console logging
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index f6afc085b903fe0a71109792593da21b665a5300..dea61aeaf8b444c71fb54459b09486a9853772d1 100644
+index 1bc42bcb5ecbf800684484530260192cc0ed0c5f..96b017a58fd12d635822255bb501ef99cdc27da6 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -197,16 +197,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -25,9 +25,9 @@ index f6afc085b903fe0a71109792593da21b665a5300..dea61aeaf8b444c71fb54459b09486a9
          DedicatedServer.LOGGER.info("Loading properties");
          DedicatedServerProperties dedicatedserverproperties = this.settings.getProperties();
  
-@@ -239,6 +229,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -238,6 +228,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         this.plazmaConfigurations.initializeGlobalConfiguration(this.registryAccess()); // Plazma - Configurable Plazma
          this.plazmaConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess()); // Plazma - Configurable Plazma
-         net.sparklypower.sparklypaper.HalloweenManager.startSyncEpochTask(); // Plazma - Port SparklyPaper patches; Optimize Spooky Season
          // Paper end - initialize global and world-defaults configuration
 +        // Paper start - detect running as root // Plazma - Tweak console logging (moved down)
 +        if (io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) {
@@ -41,7 +41,7 @@ index f6afc085b903fe0a71109792593da21b665a5300..dea61aeaf8b444c71fb54459b09486a9
          this.server.spark.enableEarlyIfRequested(); // Paper - spark
          // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
          if (this.convertOldUsers()) {
-@@ -339,6 +338,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -338,6 +337,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
          String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
          // Paper end - Add Velocity IP Forwarding Support
@@ -49,7 +49,7 @@ index f6afc085b903fe0a71109792593da21b665a5300..dea61aeaf8b444c71fb54459b09486a9
          if (!this.usesAuthentication()) {
              DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
              DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
-@@ -352,7 +352,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -351,7 +351,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
                  DedicatedServer.LOGGER.warn("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose.");
              }
              // Spigot end
@@ -71,10 +71,10 @@ index 0ea07da1b4bd420cd6765577b4719a2368b5740c..f78a0a224c86c0e3e5a44ce4f589cd8a
      }
  
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 73dd69941a004b4a2ec244f28d8683e9bdb0a445..e725f6e8205976a7b137aefb98b874cf4ae14893 100644
+index 57d29f8f3bc89529db9ee8f6dc3fffdbd4a03ceb..3ec9c947ac19412ad81d0cc85e0eff289a285d1e 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -68,4 +68,13 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -63,4 +63,13 @@ public class GlobalConfiguration extends ConfigurationPart {
  
      }
  
diff --git a/patches/server/0015-Add-missing-purpur-configuration-options.patch b/patches/server/0014-Add-missing-purpur-configuration-options.patch
similarity index 100%
rename from patches/server/0015-Add-missing-purpur-configuration-options.patch
rename to patches/server/0014-Add-missing-purpur-configuration-options.patch
diff --git a/patches/server/0016-Add-option-to-change-nether-portal-size.patch b/patches/server/0015-Add-option-to-change-nether-portal-size.patch
similarity index 97%
rename from patches/server/0016-Add-option-to-change-nether-portal-size.patch
rename to patches/server/0015-Add-option-to-change-nether-portal-size.patch
index a21f43b..a72b409 100644
--- a/patches/server/0016-Add-option-to-change-nether-portal-size.patch
+++ b/patches/server/0015-Add-option-to-change-nether-portal-size.patch
@@ -36,7 +36,7 @@ index 6c07fc507df6070854f5950a8616d2949c040656..19f58609aedecec1ea1a552c135a0b41
  
      // CraftBukkit start - return boolean, add entity
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index 069a9f8504c74d939b1df569f082cc7bd33d9cfc..b5b4229ccdecd63bd3e689e8247e44341d7c30cc 100644
+index 8dce68cf7769fcd5ea03be32621ccb6bab174697..7bd566d6e15385850930a6c0b44d1d495a671e81 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 @@ -42,6 +42,21 @@ public class WorldConfigurations extends ConfigurationPart {
diff --git a/patches/server/0017-Reduce-create-random-instance.patch b/patches/server/0016-Reduce-create-random-instance.patch
similarity index 98%
rename from patches/server/0017-Reduce-create-random-instance.patch
rename to patches/server/0016-Reduce-create-random-instance.patch
index b5fa2ea..c5b7b0d 100644
--- a/patches/server/0017-Reduce-create-random-instance.patch
+++ b/patches/server/0016-Reduce-create-random-instance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reduce create random instance
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cdeb57a799a50807f4b562d6cb49741fda994933..9c6d4f3f763a6827d1d0260c1ed8512302838bfc 100644
+index ccfeda1ba3f89112eccf29f382b5526934db1d91..469af9558d1a6c14c407746659c7bfd331c2402a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -238,6 +238,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -191,7 +191,7 @@ index 4ea1ce1cface25b9bf0e3958d55ba2fbbff69a9e..20f4d2a0996f3eb56bae5116b63b99a3
          this.hitPlayers = Maps.newHashMap();
          this.level = world;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f3c44a2ddc52661984cc07b2ee23b3a3431a4b0a..9ab004fa35687ca3274f7b937e5c379e93353c35 100644
+index 253d47418b4e9cbce74584c2461d12e17effd7bb..77000f1f73a180c7171b5d9e66e62538cf629243 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -123,16 +123,16 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -293,10 +293,10 @@ index 759b6e54db93792c9862b1f1625118ac6fa49d7a..2dccc06d847af695806321b303b6d7ca
          // Paper start - Expose firework item directly
  //        ItemStack item = this.getHandle().getEntityData().get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM);
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index e725f6e8205976a7b137aefb98b874cf4ae14893..dad5379066140b1eadab0a283cc7d8c019d8f4b6 100644
+index 3ec9c947ac19412ad81d0cc85e0eff289a285d1e..890d1d83638b2277f8c2f495f6451462899f7a17 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -65,6 +65,8 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -60,6 +60,8 @@ public class GlobalConfiguration extends ConfigurationPart {
      public Miscellaneous misc;
      public class Miscellaneous extends ConfigurationPart {
  
@@ -306,7 +306,7 @@ index e725f6e8205976a7b137aefb98b874cf4ae14893..dad5379066140b1eadab0a283cc7d8c0
      }
  
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index b5b4229ccdecd63bd3e689e8247e44341d7c30cc..33544c734798d9fa1954c7806420f1e0b3653898 100644
+index 7bd566d6e15385850930a6c0b44d1d495a671e81..37ad93ba055b1ffeaa6cea2d5df2191ef4b054ff 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 @@ -22,6 +22,7 @@ public class WorldConfigurations extends ConfigurationPart {
diff --git a/patches/server/0018-Apply-various-optimizations.patch b/patches/server/0017-Apply-various-optimizations.patch
similarity index 100%
rename from patches/server/0018-Apply-various-optimizations.patch
rename to patches/server/0017-Apply-various-optimizations.patch
diff --git a/patches/server/0019-Do-not-load-chunks-to-spawn-phantom.patch b/patches/server/0018-Do-not-load-chunks-to-spawn-phantom.patch
similarity index 95%
rename from patches/server/0019-Do-not-load-chunks-to-spawn-phantom.patch
rename to patches/server/0018-Do-not-load-chunks-to-spawn-phantom.patch
index 714e5ab..47f1047 100644
--- a/patches/server/0019-Do-not-load-chunks-to-spawn-phantom.patch
+++ b/patches/server/0018-Do-not-load-chunks-to-spawn-phantom.patch
@@ -17,7 +17,7 @@ index 04f67f7b43d2f461c776c76614dc3e5f060aea63..b3fe0dd152b3e2e1b83b4ec2270d387e
                                          FluidState fluid = world.getFluidState(blockposition1);
  
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index 33544c734798d9fa1954c7806420f1e0b3653898..b83a1058484e3d4d46f91d659f795f59d7087b72 100644
+index 37ad93ba055b1ffeaa6cea2d5df2191ef4b054ff..f77a250b3f07a1866a5b2fbebb5253b79e7cf761 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 @@ -32,6 +32,7 @@ public class WorldConfigurations extends ConfigurationPart {
diff --git a/patches/server/0020-Add-option-to-disable-moved-to-quickly-check-for-spe.patch b/patches/server/0019-Add-option-to-disable-moved-to-quickly-check-for-spe.patch
similarity index 95%
rename from patches/server/0020-Add-option-to-disable-moved-to-quickly-check-for-spe.patch
rename to patches/server/0019-Add-option-to-disable-moved-to-quickly-check-for-spe.patch
index eb510bf..4434ccc 100644
--- a/patches/server/0020-Add-option-to-disable-moved-to-quickly-check-for-spe.patch
+++ b/patches/server/0019-Add-option-to-disable-moved-to-quickly-check-for-spe.patch
@@ -18,7 +18,7 @@ index fd22a6709c7ffd828fbab5b8723f2b723af92f3d..79cfaf78840ac9052b83666d44cdd27f
                                      float f2 = flag ? 300.0F : 100.0F;
  
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index dad5379066140b1eadab0a283cc7d8c019d8f4b6..b6c5fc90654a9d89d4c70948124be6ae66c86cdf 100644
+index 890d1d83638b2277f8c2f495f6451462899f7a17..2505058e701f40f0f752d649fbce728ade6df869 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 @@ -27,6 +27,7 @@ public class GlobalConfiguration extends ConfigurationPart {
diff --git a/patches/server/0021-Configurable-cave-lava-sea-level.patch b/patches/server/0020-Configurable-cave-lava-sea-level.patch
similarity index 97%
rename from patches/server/0021-Configurable-cave-lava-sea-level.patch
rename to patches/server/0020-Configurable-cave-lava-sea-level.patch
index 0b5a585..2a10730 100644
--- a/patches/server/0021-Configurable-cave-lava-sea-level.patch
+++ b/patches/server/0020-Configurable-cave-lava-sea-level.patch
@@ -33,7 +33,7 @@ index 68be0d51aa64b5d917fb53dbbbdf8966d4f4abd8..688d9a2fe0ad0f176cd19a3ed7f2669f
  
      @Override
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index b6c5fc90654a9d89d4c70948124be6ae66c86cdf..cdbb8eba91d63a0db48b162c1e90e107cb03fd4e 100644
+index 2505058e701f40f0f752d649fbce728ade6df869..a4c4558c6ee004a8733ab15ff783d9226b62db46 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 @@ -35,6 +35,24 @@ public class GlobalConfiguration extends ConfigurationPart {
diff --git a/patches/server/0022-Configurable-entity-sensor-tick.patch b/patches/server/0021-Configurable-entity-sensor-tick.patch
similarity index 95%
rename from patches/server/0022-Configurable-entity-sensor-tick.patch
rename to patches/server/0021-Configurable-entity-sensor-tick.patch
index 16b3e1c..b8569a2 100644
--- a/patches/server/0022-Configurable-entity-sensor-tick.patch
+++ b/patches/server/0021-Configurable-entity-sensor-tick.patch
@@ -22,7 +22,7 @@ index 4b4bdaf8c43e15ba953c160a003a719aaf730318..35f150d348c3bd27416c60840988d381
              //gameprofilerfiller.push("targetSelector"); // Purpur
              if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index b83a1058484e3d4d46f91d659f795f59d7087b72..480f9948265bdb0742ebc4181bba564644809bff 100644
+index f77a250b3f07a1866a5b2fbebb5253b79e7cf761..c3f466dd8abe5c0d1a8e46a15237ee4713a2fd55 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 @@ -29,6 +29,8 @@ public class WorldConfigurations extends ConfigurationPart {
diff --git a/patches/server/0023-Variable-entity-wakeup-duration.patch b/patches/server/0022-Variable-entity-wakeup-duration.patch
similarity index 97%
rename from patches/server/0023-Variable-entity-wakeup-duration.patch
rename to patches/server/0022-Variable-entity-wakeup-duration.patch
index 9d27e77..a740735 100644
--- a/patches/server/0023-Variable-entity-wakeup-duration.patch
+++ b/patches/server/0022-Variable-entity-wakeup-duration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Variable entity wakeup duration
 
 
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index 480f9948265bdb0742ebc4181bba564644809bff..f5249795503b97b66644f59ff4a1afa66b6b6759 100644
+index c3f466dd8abe5c0d1a8e46a15237ee4713a2fd55..7098e77b66a32ed10025dbbd53efdde43ea993e0 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 @@ -38,6 +38,20 @@ public class WorldConfigurations extends ConfigurationPart {
diff --git a/patches/server/0024-Optimise-state-lookup-more.patch b/patches/server/0023-Optimise-state-lookup-more.patch
similarity index 100%
rename from patches/server/0024-Optimise-state-lookup-more.patch
rename to patches/server/0023-Optimise-state-lookup-more.patch
diff --git a/patches/server/0025-Skip-event-if-no-listeners.patch b/patches/server/0024-Skip-event-if-no-listeners.patch
similarity index 100%
rename from patches/server/0025-Skip-event-if-no-listeners.patch
rename to patches/server/0024-Skip-event-if-no-listeners.patch
diff --git a/patches/server/0026-Add-entity-spawn-deadlock-timer.patch b/patches/server/0025-Add-entity-spawn-deadlock-timer.patch
similarity index 97%
rename from patches/server/0026-Add-entity-spawn-deadlock-timer.patch
rename to patches/server/0025-Add-entity-spawn-deadlock-timer.patch
index 4b2de42..0d27553 100644
--- a/patches/server/0026-Add-entity-spawn-deadlock-timer.patch
+++ b/patches/server/0025-Add-entity-spawn-deadlock-timer.patch
@@ -61,7 +61,7 @@ index 967af8771ff8564c715d89f4b4b69b16c25add59..2ac5fb585636523787e05edaa58a4fa3
          return nbt;
      }
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index f5249795503b97b66644f59ff4a1afa66b6b6759..5978970f80b1b4672298426dcd8026e453025a52 100644
+index 7098e77b66a32ed10025dbbd53efdde43ea993e0..03508680792bbf2a197aa2b310425a78f70bf491 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 @@ -52,6 +52,14 @@ public class WorldConfigurations extends ConfigurationPart {
diff --git a/patches/server/0027-Lithium-HashedList.patch b/patches/server/0026-Lithium-HashedList.patch
similarity index 100%
rename from patches/server/0027-Lithium-HashedList.patch
rename to patches/server/0026-Lithium-HashedList.patch
diff --git a/patches/server/0028-Improve-SwingTime-ticking.patch b/patches/server/0027-Improve-SwingTime-ticking.patch
similarity index 100%
rename from patches/server/0028-Improve-SwingTime-ticking.patch
rename to patches/server/0027-Improve-SwingTime-ticking.patch
diff --git a/patches/server/0029-Save-Json-list-asynchronously.patch b/patches/server/0028-Save-Json-list-asynchronously.patch
similarity index 100%
rename from patches/server/0029-Save-Json-list-asynchronously.patch
rename to patches/server/0028-Save-Json-list-asynchronously.patch
diff --git a/patches/server/0031-Process-pathfinding-asynchronously.patch b/patches/server/0029-Process-pathfinding-asynchronously.patch
similarity index 99%
rename from patches/server/0031-Process-pathfinding-asynchronously.patch
rename to patches/server/0029-Process-pathfinding-asynchronously.patch
index 30594ae..ca4147c 100644
--- a/patches/server/0031-Process-pathfinding-asynchronously.patch
+++ b/patches/server/0029-Process-pathfinding-asynchronously.patch
@@ -1270,12 +1270,12 @@ index 1c83926923f50fb4da1a83dc91614c20a831555f..aec2d0f9a957be65d031957dbff874d8
  
          Command.broadcastCommandMessage(sender, text("Successfully reloaded Plazma configuration files.", NamedTextColor.GREEN));
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index cdbb8eba91d63a0db48b162c1e90e107cb03fd4e..ee11fe3ec418fc2d82dab5fc1380c4a0d370666d 100644
+index a4c4558c6ee004a8733ab15ff783d9226b62db46..f531aa3a083f022b179938efd5f9c83ce5a2925b 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -62,6 +62,26 @@ public class GlobalConfiguration extends ConfigurationPart {
-         boolean skipSqrWhenNoDeltaChanges = OPTIMIZE;
-         public boolean spookyOptimize = OPTIMIZE;
+@@ -60,6 +60,26 @@ public class GlobalConfiguration extends ConfigurationPart {
+     public class Entity extends ConfigurationPart {
+ 
  
 +        public AsyncPathProcess asyncPathProcess;
 +        public class AsyncPathProcess extends ConfigurationPart {
@@ -1299,4 +1299,4 @@ index cdbb8eba91d63a0db48b162c1e90e107cb03fd4e..ee11fe3ec418fc2d82dab5fc1380c4a0
 +
          @PostProcess
          public void post() {
-             net.minecraft.server.level.ServerEntity.skipSqrWhenNoDeltaChanges = this.skipSqrWhenNoDeltaChanges;
+         }
diff --git a/patches/server/0032-Use-Akair-s-flag-when-running-the-test-server-with-g.patch b/patches/server/0030-Use-Akair-s-flag-when-running-the-test-server-with-g.patch
similarity index 100%
rename from patches/server/0032-Use-Akair-s-flag-when-running-the-test-server-with-g.patch
rename to patches/server/0030-Use-Akair-s-flag-when-running-the-test-server-with-g.patch
diff --git a/patches/server/0033-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch b/patches/server/0031-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch
similarity index 96%
rename from patches/server/0033-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch
rename to patches/server/0031-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch
index 528981c..71c1da9 100644
--- a/patches/server/0033-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch
+++ b/patches/server/0031-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use Plazma logo instead if server favicon doesn't exist
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3db4711c19d17856e9235bf4568c63d932f57d00..01c31f49010e8b9b2f0fc047731bf3f42c618435 100644
+index 469af9558d1a6c14c407746659c7bfd331c2402a..6e7ac081889e5da49ebbe0c75f929de1aea9043c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1588,29 +1588,32 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1585,29 +1585,32 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      private Optional<ServerStatus.Favicon> loadStatusIcon() {
diff --git a/patches/server/0034-Implement-FreedomChat.patch b/patches/server/0032-Implement-FreedomChat.patch
similarity index 97%
rename from patches/server/0034-Implement-FreedomChat.patch
rename to patches/server/0032-Implement-FreedomChat.patch
index abe4281..9d616a2 100644
--- a/patches/server/0034-Implement-FreedomChat.patch
+++ b/patches/server/0032-Implement-FreedomChat.patch
@@ -20,10 +20,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index dea61aeaf8b444c71fb54459b09486a9853772d1..6c43b022946e5c7260012802200cd64da4992b86 100644
+index 96b017a58fd12d635822255bb501ef99cdc27da6..260a5fafac081011b394b5c677962b41eeee32a6 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -711,6 +711,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -710,6 +710,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          // Paper start - Add setting for proxy online mode status
          return dedicatedserverproperties.enforceSecureProfile
              && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()
@@ -52,7 +52,7 @@ index f78a0a224c86c0e3e5a44ce4f589cd8a61c546f9..69ff5380eedb3e0b214324dec50bb5c0
          player.loadGameTypes((CompoundTag) optional.orElse(null)); // CraftBukkit - decompile error
          ServerGamePacketListenerImpl playerconnection = new ServerGamePacketListenerImpl(this.server, connection, player, clientData);
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index ee11fe3ec418fc2d82dab5fc1380c4a0d370666d..d781a7ba785789c9657c94fb0d164e532daccc96 100644
+index f531aa3a083f022b179938efd5f9c83ce5a2925b..3ac55c0b156bb1b0fca7092aa047007c5a878c6e 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 @@ -29,6 +29,15 @@ public class GlobalConfiguration extends ConfigurationPart {
diff --git a/patches/server/0035-Add-some-missing-Pufferfish-configurations.patch b/patches/server/0033-Add-some-missing-Pufferfish-configurations.patch
similarity index 100%
rename from patches/server/0035-Add-some-missing-Pufferfish-configurations.patch
rename to patches/server/0033-Add-some-missing-Pufferfish-configurations.patch
diff --git a/patches/server/0009-Port-SparklyPaper-patches.patch b/patches/server/0034-Port-SparklyPaper-patches.patch
similarity index 97%
rename from patches/server/0009-Port-SparklyPaper-patches.patch
rename to patches/server/0034-Port-SparklyPaper-patches.patch
index 9631a77..40bcb2c 100644
--- a/patches/server/0009-Port-SparklyPaper-patches.patch
+++ b/patches/server/0034-Port-SparklyPaper-patches.patch
@@ -112,10 +112,10 @@ index c03608fec96b51e1867f43d8f42e5aefb1520e46..93180066224345c0332fb33744f84204
                  throw new IllegalStateException("Ticking retired scheduler");
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ccfeda1ba3f89112eccf29f382b5526934db1d91..cdeb57a799a50807f4b562d6cb49741fda994933 100644
+index 6e7ac081889e5da49ebbe0c75f929de1aea9043c..68dce6a72f3305d91a5571fd3527f0df43fb5d8b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -327,6 +327,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -328,6 +328,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public volatile boolean abnormalExit = false; // Paper
      public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
      public gg.pufferfish.pufferfish.util.AsyncExecutor mobSpawnExecutor = new gg.pufferfish.pufferfish.util.AsyncExecutor("MobSpawning"); // Pufferfish - optimize mob spawning
@@ -123,7 +123,7 @@ index ccfeda1ba3f89112eccf29f382b5526934db1d91..cdeb57a799a50807f4b562d6cb49741f
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -1773,17 +1774,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1777,17 +1778,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          //MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Spigot // Paper // Purpur
          // Paper start - Folia scheduler API
          ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
@@ -147,7 +147,7 @@ index ccfeda1ba3f89112eccf29f382b5526934db1d91..cdeb57a799a50807f4b562d6cb49741f
          // Paper end - Folia scheduler API
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
          //this.profiler.push("commandFunctions"); // Purpur
-@@ -1849,8 +1845,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1853,8 +1849,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              //this.profiler.push("tick"); // Purpur
  
              try {
@@ -166,17 +166,17 @@ index ccfeda1ba3f89112eccf29f382b5526934db1d91..cdeb57a799a50807f4b562d6cb49741f
              } catch (Throwable throwable) {
                  CrashReport crashreport = CrashReport.forThrowable(throwable, "Exception ticking world");
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 1bc42bcb5ecbf800684484530260192cc0ed0c5f..f6afc085b903fe0a71109792593da21b665a5300 100644
+index 260a5fafac081011b394b5c677962b41eeee32a6..6c43b022946e5c7260012802200cd64da4992b86 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -237,6 +237,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -227,6 +227,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
          this.plazmaConfigurations.initializeGlobalConfiguration(this.registryAccess()); // Plazma - Configurable Plazma
          this.plazmaConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess()); // Plazma - Configurable Plazma
 +        net.sparklypower.sparklypaper.HalloweenManager.startSyncEpochTask(); // Plazma - Port SparklyPaper patches; Optimize Spooky Season
          // Paper end - initialize global and world-defaults configuration
-         this.server.spark.enableEarlyIfRequested(); // Paper - spark
-         // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
+         // Paper start - detect running as root // Plazma - Tweak console logging (moved down)
+         if (io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
 index 1883abec14e05f8eb2e865446b4d81091b1aa5e0..adfc891ae8868bb562910ad169c116e5d30348c7 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -349,7 +349,7 @@ index 608390ed36710a419de1542b80340dd3fcc7299c..043f068345ca3c50209c1c3cc1feb627
                      mapItemSavedData.tickCarriedBy(player, stack);
                  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 253d47418b4e9cbce74584c2461d12e17effd7bb..f3c44a2ddc52661984cc07b2ee23b3a3431a4b0a 100644
+index 77000f1f73a180c7171b5d9e66e62538cf629243..9ab004fa35687ca3274f7b937e5c379e93353c35 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1456,6 +1456,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -847,23 +847,27 @@ index 8149b9c51b78eb5c689b7218a2ca3aab60e73bcf..b9a303f6280a2f6ad3616da152922a4f
      }
  
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 57d29f8f3bc89529db9ee8f6dc3fffdbd4a03ceb..73dd69941a004b4a2ec244f28d8683e9bdb0a445 100644
+index 3ac55c0b156bb1b0fca7092aa047007c5a878c6e..d781a7ba785789c9657c94fb0d164e532daccc96 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -40,9 +40,12 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -68,6 +68,8 @@ public class GlobalConfiguration extends ConfigurationPart {
      public Entity entity;
      public class Entity extends ConfigurationPart {
  
 +        boolean skipSqrWhenNoDeltaChanges = OPTIMIZE;
 +        public boolean spookyOptimize = OPTIMIZE;
  
+         public AsyncPathProcess asyncPathProcess;
+         public class AsyncPathProcess extends ConfigurationPart {
+@@ -91,6 +93,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+ 
          @PostProcess
          public void post() {
 +            net.minecraft.server.level.ServerEntity.skipSqrWhenNoDeltaChanges = this.skipSqrWhenNoDeltaChanges;
          }
  
      }
-@@ -50,9 +53,11 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -98,9 +101,11 @@ public class GlobalConfiguration extends ConfigurationPart {
      public World world;
      public class World extends ConfigurationPart {
  
@@ -876,10 +880,10 @@ index 57d29f8f3bc89529db9ee8f6dc3fffdbd4a03ceb..73dd69941a004b4a2ec244f28d8683e9
  
      }
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index 8dce68cf7769fcd5ea03be32621ccb6bab174697..069a9f8504c74d939b1df569f082cc7bd33d9cfc 100644
+index 03508680792bbf2a197aa2b310425a78f70bf491..5978970f80b1b4672298426dcd8026e453025a52 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-@@ -49,7 +49,22 @@ public class WorldConfigurations extends ConfigurationPart {
+@@ -90,7 +90,22 @@ public class WorldConfigurations extends ConfigurationPart {
  
      public Block block;
      public class Block extends ConfigurationPart {
diff --git a/patches/server/0030-Add-more-MSPT.patch b/patches/server/0035-Add-more-MSPT.patch
similarity index 97%
rename from patches/server/0030-Add-more-MSPT.patch
rename to patches/server/0035-Add-more-MSPT.patch
index 546182c..5e924d1 100644
--- a/patches/server/0030-Add-more-MSPT.patch
+++ b/patches/server/0035-Add-more-MSPT.patch
@@ -94,7 +94,7 @@ index 03be23690a94a14d7343526acad67ccf53b85c70..416c0a736edf47f76a37be0bc5fe8678
                  )
              );
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9c6d4f3f763a6827d1d0260c1ed8512302838bfc..3db4711c19d17856e9235bf4568c63d932f57d00 100644
+index 68dce6a72f3305d91a5571fd3527f0df43fb5d8b..01c31f49010e8b9b2f0fc047731bf3f42c618435 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -260,8 +260,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -108,7 +108,7 @@ index 9c6d4f3f763a6827d1d0260c1ed8512302838bfc..3db4711c19d17856e9235bf4568c63d9
      public final TickTimes tickTimes60s = new TickTimes(1200);
      // Paper end - Add tick times API and /mspt command
      @Nullable
-@@ -1851,8 +1853,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1854,8 +1856,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  worldserver.tick(shouldKeepTicking); // diff on changes
                  long after = Util.getNanos() - before;
  
diff --git a/patches/unapplied/server/0008-Port-SparklyPaper-patches.patch b/patches/unapplied/server/dropped/0008-Port-SparklyPaper-patches.patch
similarity index 100%
rename from patches/unapplied/server/0008-Port-SparklyPaper-patches.patch
rename to patches/unapplied/server/dropped/0008-Port-SparklyPaper-patches.patch