diff --git a/patches/unapplied/server/dropped/0024-Configurable-cave-lava-sea-level.patch b/patches/server/0024-Configurable-cave-lava-sea-level.patch
similarity index 97%
rename from patches/unapplied/server/dropped/0024-Configurable-cave-lava-sea-level.patch
rename to patches/server/0024-Configurable-cave-lava-sea-level.patch
index 7de9c11c8..6841cae45 100644
--- a/patches/unapplied/server/dropped/0024-Configurable-cave-lava-sea-level.patch
+++ b/patches/server/0024-Configurable-cave-lava-sea-level.patch
@@ -26,7 +26,7 @@ index 8ce870a5341a61fbbaf42021ef7f7f615a6a3e09..e3990d5f5a49aca501289e92f7462a5f
          int i = settings.seaLevel();
          Aquifer.FluidStatus aquifer_b1 = new Aquifer.FluidStatus(i, settings.defaultFluid());
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index f7e4d14a7eaa3e35c9b03f3c6a01ae8712ded569..4f3ed01e12ccb8a6f1a5c4f605451bb36370a236 100644
+index e8e8c2d55b934b3043c1f83092b63dee1c5fcc4e..fd2544c52f0948f7dae14814fbf0310d8e49170d 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 @@ -35,6 +35,25 @@ public class GlobalConfiguration extends ConfigurationPart {
diff --git a/patches/server/0024-Ignore-useless-entity-packets.patch b/patches/server/0025-Ignore-useless-entity-packets.patch
similarity index 100%
rename from patches/server/0024-Ignore-useless-entity-packets.patch
rename to patches/server/0025-Ignore-useless-entity-packets.patch
diff --git a/patches/server/0025-Configurable-entity-sensor-tick.patch b/patches/server/0026-Configurable-entity-sensor-tick.patch
similarity index 100%
rename from patches/server/0025-Configurable-entity-sensor-tick.patch
rename to patches/server/0026-Configurable-entity-sensor-tick.patch
diff --git a/patches/server/0026-Variable-entity-wakeup-duration.patch b/patches/server/0027-Variable-entity-wakeup-duration.patch
similarity index 100%
rename from patches/server/0026-Variable-entity-wakeup-duration.patch
rename to patches/server/0027-Variable-entity-wakeup-duration.patch
diff --git a/patches/server/0027-Optimise-state-lookup-more.patch b/patches/server/0028-Optimise-state-lookup-more.patch
similarity index 100%
rename from patches/server/0027-Optimise-state-lookup-more.patch
rename to patches/server/0028-Optimise-state-lookup-more.patch
diff --git a/patches/server/0028-Suppress-errors-from-dirty-attributes.patch b/patches/server/0029-Suppress-errors-from-dirty-attributes.patch
similarity index 100%
rename from patches/server/0028-Suppress-errors-from-dirty-attributes.patch
rename to patches/server/0029-Suppress-errors-from-dirty-attributes.patch
diff --git a/patches/server/0029-Skip-event-if-no-listeners.patch b/patches/server/0030-Skip-event-if-no-listeners.patch
similarity index 100%
rename from patches/server/0029-Skip-event-if-no-listeners.patch
rename to patches/server/0030-Skip-event-if-no-listeners.patch
diff --git a/patches/server/0030-Add-entity-spawn-deadlock-timer.patch b/patches/server/0031-Add-entity-spawn-deadlock-timer.patch
similarity index 100%
rename from patches/server/0030-Add-entity-spawn-deadlock-timer.patch
rename to patches/server/0031-Add-entity-spawn-deadlock-timer.patch
diff --git a/patches/server/0031-Lithium-HashedList.patch b/patches/server/0032-Lithium-HashedList.patch
similarity index 100%
rename from patches/server/0031-Lithium-HashedList.patch
rename to patches/server/0032-Lithium-HashedList.patch
diff --git a/patches/server/0032-Improve-SwingTime-ticking.patch b/patches/server/0033-Improve-SwingTime-ticking.patch
similarity index 100%
rename from patches/server/0032-Improve-SwingTime-ticking.patch
rename to patches/server/0033-Improve-SwingTime-ticking.patch
diff --git a/patches/server/0033-Save-Json-list-asynchronously.patch b/patches/server/0034-Save-Json-list-asynchronously.patch
similarity index 100%
rename from patches/server/0033-Save-Json-list-asynchronously.patch
rename to patches/server/0034-Save-Json-list-asynchronously.patch
diff --git a/patches/server/0034-Add-more-MSPT.patch b/patches/server/0035-Add-more-MSPT.patch
similarity index 100%
rename from patches/server/0034-Add-more-MSPT.patch
rename to patches/server/0035-Add-more-MSPT.patch
diff --git a/patches/server/0035-Process-pathfinding-asynchronously.patch b/patches/server/0036-Process-pathfinding-asynchronously.patch
similarity index 99%
rename from patches/server/0035-Process-pathfinding-asynchronously.patch
rename to patches/server/0036-Process-pathfinding-asynchronously.patch
index 9e87ef9e8..01e15d19a 100644
--- a/patches/server/0035-Process-pathfinding-asynchronously.patch
+++ b/patches/server/0036-Process-pathfinding-asynchronously.patch
@@ -1285,10 +1285,10 @@ 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 e8e8c2d55b934b3043c1f83092b63dee1c5fcc4e..c809a4692fcabf87c16fcd932ef25a718c2935d3 100644
+index fd2544c52f0948f7dae14814fbf0310d8e49170d..b18dfe9223b75d8a36b4b3a934625914f9a6a553 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -44,6 +44,26 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -63,6 +63,26 @@ public class GlobalConfiguration extends ConfigurationPart {
          boolean skipSqrWhenNoDeltaChanges = OPTIMIZE;
          public boolean spookyOptimize = OPTIMIZE;
  
diff --git a/patches/server/0036-Use-Akair-s-flag-when-running-the-test-server-with-g.patch b/patches/server/0037-Use-Akair-s-flag-when-running-the-test-server-with-g.patch
similarity index 100%
rename from patches/server/0036-Use-Akair-s-flag-when-running-the-test-server-with-g.patch
rename to patches/server/0037-Use-Akair-s-flag-when-running-the-test-server-with-g.patch
diff --git a/patches/server/0037-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch b/patches/server/0038-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch
similarity index 100%
rename from patches/server/0037-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch
rename to patches/server/0038-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch
diff --git a/patches/server/0038-Implement-FreedomChat.patch b/patches/server/0039-Implement-FreedomChat.patch
similarity index 99%
rename from patches/server/0038-Implement-FreedomChat.patch
rename to patches/server/0039-Implement-FreedomChat.patch
index f42a14714..81acfa6bb 100644
--- a/patches/server/0038-Implement-FreedomChat.patch
+++ b/patches/server/0039-Implement-FreedomChat.patch
@@ -52,7 +52,7 @@ index c36ebab552c480d34e7fd48a45f0a320a97b9677..fdfe8f5bc5ad0e5f5ded41d87756a586
          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 c809a4692fcabf87c16fcd932ef25a718c2935d3..a237a4ea3b60ba3b5a2cfa12748ac682240a8a4e 100644
+index b18dfe9223b75d8a36b4b3a934625914f9a6a553..19b198fb1d0ffee28a2cfd516cb31204fd1a310c 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/0039-Add-some-missing-Pufferfish-configurations.patch b/patches/server/0040-Add-some-missing-Pufferfish-configurations.patch
similarity index 100%
rename from patches/server/0039-Add-some-missing-Pufferfish-configurations.patch
rename to patches/server/0040-Add-some-missing-Pufferfish-configurations.patch
diff --git a/patches/server/0040-Improve-biome-temperature-cache.patch b/patches/server/0041-Improve-biome-temperature-cache.patch
similarity index 100%
rename from patches/server/0040-Improve-biome-temperature-cache.patch
rename to patches/server/0041-Improve-biome-temperature-cache.patch