diff --git a/patches/server/0011-Barrels-and-enderchests-6-rows.patch b/patches/server/0010-Barrels-and-enderchests-6-rows.patch
similarity index 99%
rename from patches/server/0011-Barrels-and-enderchests-6-rows.patch
rename to patches/server/0010-Barrels-and-enderchests-6-rows.patch
index 1444d9ffc..549d927df 100644
--- a/patches/server/0011-Barrels-and-enderchests-6-rows.patch
+++ b/patches/server/0010-Barrels-and-enderchests-6-rows.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Barrels and enderchests 6 rows
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3ef2c88ddec0f7088d1d88d1d98286bed382e1c1..3c9d72dd1a1bade79e4c8b5e6c7b136f906ba77d 100644
+index 2fbe18c4a3ad86a319122aecdb7735cd7f8a238a..989562f870c359cf4655af2b2013b2b1b5f1f229 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1193,6 +1193,27 @@ public abstract class PlayerList {
diff --git a/patches/server/0010-Timings-stuff.patch b/patches/server/0010-Timings-stuff.patch
deleted file mode 100644
index 0ca6ea63a..000000000
--- a/patches/server/0010-Timings-stuff.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 5 Jun 2020 21:30:19 -0500
-Subject: [PATCH] Timings stuff
-
-
-diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 2cc44fbf8e5bd436b6d4e19f6c06b351e750cb31..fa8eb9fb4122097d2a5cb1d07f75c830ad6b2f57 100644
---- a/src/main/java/co/aikar/timings/TimingsExport.java
-+++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -239,10 +239,14 @@ public class TimingsExport extends Thread {
-         // Information on the users Config
- 
-         parent.put("config", createObject(
--            pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
-+            // Purpur start
-+            pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
-             pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
--            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Pufferfish
--            pair("pufferfish", mapAsJSON(gg.pufferfish.pufferfish.PufferfishConfig.getConfigCopy(), null)) // Pufferfish
-+            pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
-+            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
-+            pair("pufferfish", mapAsJSON(gg.pufferfish.pufferfish.PufferfishConfig.getConfigCopy(), null)), // Pufferfish
-+            pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
-+            // Purpur end
-         ));
- 
-         new TimingsExport(listeners, parent, history).start();
-@@ -283,6 +287,19 @@ public class TimingsExport extends Thread {
-         return timingsCost;
-     }
- 
-+    // Purpur start
-+    private static JSONObject mapAsJSON(java.util.Properties properties) {
-+        JSONObject object = new JSONObject();
-+        for (String key : properties.stringPropertyNames()) {
-+            if (key.startsWith("rcon") || key.startsWith("query") ||  key.equals("level-seed") || TimingsManager.hiddenConfigs.contains(key)) {
-+                continue;
-+            }
-+            object.put(key, valAsJSON(properties.get(key), key));
-+        }
-+        return object;
-+    }
-+    // Purpur end
-+
-     private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) {
- 
-         JSONObject object = new JSONObject();
diff --git a/patches/server/0012-Llama-API.patch b/patches/server/0011-Llama-API.patch
similarity index 100%
rename from patches/server/0012-Llama-API.patch
rename to patches/server/0011-Llama-API.patch
diff --git a/patches/server/0013-AFK-API.patch b/patches/server/0012-AFK-API.patch
similarity index 99%
rename from patches/server/0013-AFK-API.patch
rename to patches/server/0012-AFK-API.patch
index 601d0ec0a..a2e82546e 100644
--- a/patches/server/0013-AFK-API.patch
+++ b/patches/server/0012-AFK-API.patch
@@ -68,7 +68,7 @@ index 1628989f81e76fc61b2a894f7037f5630a1491bc..c72b20e3e7eda999c6da07e7e6fb4682
          return this.stats;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3da6eb36490f15ecccf9d93d8ec2c1a58646b722..8b2c0e87a8bc51fe5c8d2494330766ea478145bf 100644
+index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a17988474344d244 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -340,6 +340,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0014-Bring-back-server-name.patch b/patches/server/0013-Bring-back-server-name.patch
similarity index 89%
rename from patches/server/0014-Bring-back-server-name.patch
rename to patches/server/0013-Bring-back-server-name.patch
index d1f8027a6..443196ce8 100644
--- a/patches/server/0014-Bring-back-server-name.patch
+++ b/patches/server/0013-Bring-back-server-name.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index 26345494ce190b5cd2ab58dd7d4b046796767b20..20d579a20e186e59975df1b35112015e183cee36 100644
+index a32cfa75a9bea896f558bab646d0868391b069a9..01ca7156d86243a80cd343a2a66be9ebedcc3b7c 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 @@ -49,6 +49,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
@@ -17,7 +17,7 @@ index 26345494ce190b5cd2ab58dd7d4b046796767b20..20d579a20e186e59975df1b35112015e
      public final boolean spawnNpcs = this.get("spawn-npcs", true);
      public final boolean pvp = this.get("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 17ad3fb575444c36884202daffb685d03f0a5cb8..ce0f32be89e0a21e536de21e7b24bfa048fd55cb 100644
+index 6fca71fa3cb8c8ff53fe85966f251efecf9b4f6b..c9f1b0b48300d0ea24c62eb83198a4cd54d6cd02 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2919,4 +2919,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0015-Configurable-server-mod-name.patch b/patches/server/0014-Configurable-server-mod-name.patch
similarity index 94%
rename from patches/server/0015-Configurable-server-mod-name.patch
rename to patches/server/0014-Configurable-server-mod-name.patch
index 9a9433fd5..e5afd487c 100644
--- a/patches/server/0015-Configurable-server-mod-name.patch
+++ b/patches/server/0014-Configurable-server-mod-name.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ef66e1134099b5d328858bb7e25488529e12690d..bf68f5632c374fe725f00de119f09fb703cf61fb 100644
+index 3b24edf04cb2f2ebd9adb16839bd92be4d444390..23bbe6196f5141934aa623eed124b6bb99e3220e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1658,7 +1658,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0016-LivingEntity-safeFallDistance.patch b/patches/server/0015-LivingEntity-safeFallDistance.patch
similarity index 97%
rename from patches/server/0016-LivingEntity-safeFallDistance.patch
rename to patches/server/0015-LivingEntity-safeFallDistance.patch
index 61a441cd8..d22359e79 100644
--- a/patches/server/0016-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0015-LivingEntity-safeFallDistance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5a45e04f81171b3682cf39fcd3e35e440dec9090..6c769141376f6995d6572d5e3cf3a999ff954e82 100644
+index 6f6386230dcd061760a8386691063601f9a7f1d5..9bb19e7a112c1411bb6b717de983c0359f6b0cb6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -255,6 +255,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0017-Lagging-threshold.patch b/patches/server/0016-Lagging-threshold.patch
similarity index 96%
rename from patches/server/0017-Lagging-threshold.patch
rename to patches/server/0016-Lagging-threshold.patch
index 121b9622e..cfc618fa3 100644
--- a/patches/server/0017-Lagging-threshold.patch
+++ b/patches/server/0016-Lagging-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c4cad668a87f1438fcc4fe1f514bd4dc9c605ed6..f4d332008924aff0e9c17e57d7d5876994af4b4b 100644
+index 23bbe6196f5141934aa623eed124b6bb99e3220e..53096efdc2d2e27537e36259ebda9137100de846 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -294,6 +294,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0018-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 100%
rename from patches/server/0018-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch
diff --git a/patches/server/0019-EMC-MonsterEggSpawnEvent.patch b/patches/server/0018-EMC-MonsterEggSpawnEvent.patch
similarity index 100%
rename from patches/server/0019-EMC-MonsterEggSpawnEvent.patch
rename to patches/server/0018-EMC-MonsterEggSpawnEvent.patch
diff --git a/patches/server/0020-Player-invulnerabilities.patch b/patches/server/0019-Player-invulnerabilities.patch
similarity index 100%
rename from patches/server/0020-Player-invulnerabilities.patch
rename to patches/server/0019-Player-invulnerabilities.patch
diff --git a/patches/server/0021-Anvil-API.patch b/patches/server/0020-Anvil-API.patch
similarity index 98%
rename from patches/server/0021-Anvil-API.patch
rename to patches/server/0020-Anvil-API.patch
index 7c23dfe33..e5515ad35 100644
--- a/patches/server/0021-Anvil-API.patch
+++ b/patches/server/0020-Anvil-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Anvil API
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 79d8bcf3f9b0fe4a65ad7899f858efefac6feaa7..79770da8a1e4ca3f5c531fd040626b90124aeb66 100644
+index 49b063655dfc09e30d446dbf07503fdda04a7e30..31c9bb73b73be99b95a7dde55d276964522a6d7d 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -75,6 +75,7 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0022-Configurable-villager-brain-ticks.patch b/patches/server/0021-Configurable-villager-brain-ticks.patch
similarity index 100%
rename from patches/server/0022-Configurable-villager-brain-ticks.patch
rename to patches/server/0021-Configurable-villager-brain-ticks.patch
diff --git a/patches/server/0023-Alternative-Keepalive-Handling.patch b/patches/server/0022-Alternative-Keepalive-Handling.patch
similarity index 100%
rename from patches/server/0023-Alternative-Keepalive-Handling.patch
rename to patches/server/0022-Alternative-Keepalive-Handling.patch
diff --git a/patches/server/0024-Silk-touch-spawners.patch b/patches/server/0023-Silk-touch-spawners.patch
similarity index 99%
rename from patches/server/0024-Silk-touch-spawners.patch
rename to patches/server/0023-Silk-touch-spawners.patch
index 94d1ca62b..add1340b3 100644
--- a/patches/server/0024-Silk-touch-spawners.patch
+++ b/patches/server/0023-Silk-touch-spawners.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Silk touch spawners
 
 
 diff --git a/src/main/java/net/minecraft/world/item/Items.java b/src/main/java/net/minecraft/world/item/Items.java
-index d9ba3ae228791ebf6ea29353fb88c1765fa4d20c..21c9733065f6ecb265e4df8a7080697356c796ac 100644
+index 51016663829b1f36b8e752dcf9c9361282c3f06b..e0a635d647113bb363df2ddc293f2495c56e5d3c 100644
 --- a/src/main/java/net/minecraft/world/item/Items.java
 +++ b/src/main/java/net/minecraft/world/item/Items.java
 @@ -271,7 +271,7 @@ public class Items {
diff --git a/patches/server/0025-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch
similarity index 100%
rename from patches/server/0025-MC-168772-Fix-Add-turtle-egg-block-options.patch
rename to patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch
diff --git a/patches/server/0026-Fix-vanilla-command-permission-handler.patch b/patches/server/0025-Fix-vanilla-command-permission-handler.patch
similarity index 100%
rename from patches/server/0026-Fix-vanilla-command-permission-handler.patch
rename to patches/server/0025-Fix-vanilla-command-permission-handler.patch
diff --git a/patches/server/0027-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch
similarity index 100%
rename from patches/server/0027-Logger-settings-suppressing-pointless-logs.patch
rename to patches/server/0026-Logger-settings-suppressing-pointless-logs.patch
diff --git a/patches/server/0028-Disable-outdated-build-check.patch b/patches/server/0027-Disable-outdated-build-check.patch
similarity index 100%
rename from patches/server/0028-Disable-outdated-build-check.patch
rename to patches/server/0027-Disable-outdated-build-check.patch
diff --git a/patches/server/0029-Giants-AI-settings.patch b/patches/server/0028-Giants-AI-settings.patch
similarity index 100%
rename from patches/server/0029-Giants-AI-settings.patch
rename to patches/server/0028-Giants-AI-settings.patch
diff --git a/patches/server/0030-Zombie-horse-naturally-spawn.patch b/patches/server/0029-Zombie-horse-naturally-spawn.patch
similarity index 100%
rename from patches/server/0030-Zombie-horse-naturally-spawn.patch
rename to patches/server/0029-Zombie-horse-naturally-spawn.patch
diff --git a/patches/server/0031-Charged-creeper-naturally-spawn.patch b/patches/server/0030-Charged-creeper-naturally-spawn.patch
similarity index 96%
rename from patches/server/0031-Charged-creeper-naturally-spawn.patch
rename to patches/server/0030-Charged-creeper-naturally-spawn.patch
index 0c8f3ee91..6793ac990 100644
--- a/patches/server/0031-Charged-creeper-naturally-spawn.patch
+++ b/patches/server/0030-Charged-creeper-naturally-spawn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Charged creeper naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 0bf2355b7ac80227c06b3e85f1645559275a96e5..2a5f7fb0e60f41b6627255146ca18b271ac6395f 100644
+index bb9fc7f78514b434aba2de25f79fb3404eac4c72..5b20eea9dd51498842599579b2f105e582ccec58 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -143,6 +143,14 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0032-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch
similarity index 100%
rename from patches/server/0032-Rabbit-naturally-spawn-toast-and-killer.patch
rename to patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch
diff --git a/patches/server/0033-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 100%
rename from patches/server/0033-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/server/0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch
diff --git a/patches/server/0034-Tulips-change-fox-type.patch b/patches/server/0033-Tulips-change-fox-type.patch
similarity index 97%
rename from patches/server/0034-Tulips-change-fox-type.patch
rename to patches/server/0033-Tulips-change-fox-type.patch
index d1b41bf63..3b9553df5 100644
--- a/patches/server/0034-Tulips-change-fox-type.patch
+++ b/patches/server/0033-Tulips-change-fox-type.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Tulips change fox type
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 8d25d79be606b173a59264706172561165f82143..f03bd9a9129f0d45d36ef56a726d513a8cc088e5 100644
+index 0d1e8ad0edcbe53d203b9fa6748f76f783afae5c..a708a9d855fd32c0eb659b44d91a5a1a33312cc7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -35,6 +35,7 @@ import net.minecraft.util.Mth;
diff --git a/patches/server/0035-Breedable-Polar-Bears.patch b/patches/server/0034-Breedable-Polar-Bears.patch
similarity index 100%
rename from patches/server/0035-Breedable-Polar-Bears.patch
rename to patches/server/0034-Breedable-Polar-Bears.patch
diff --git a/patches/server/0036-Chickens-can-retaliate.patch b/patches/server/0035-Chickens-can-retaliate.patch
similarity index 100%
rename from patches/server/0036-Chickens-can-retaliate.patch
rename to patches/server/0035-Chickens-can-retaliate.patch
diff --git a/patches/server/0037-Add-option-to-set-armorstand-step-height.patch b/patches/server/0036-Add-option-to-set-armorstand-step-height.patch
similarity index 100%
rename from patches/server/0037-Add-option-to-set-armorstand-step-height.patch
rename to patches/server/0036-Add-option-to-set-armorstand-step-height.patch
diff --git a/patches/server/0038-Cat-spawning-options.patch b/patches/server/0037-Cat-spawning-options.patch
similarity index 100%
rename from patches/server/0038-Cat-spawning-options.patch
rename to patches/server/0037-Cat-spawning-options.patch
diff --git a/patches/server/0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch
similarity index 100%
rename from patches/server/0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch
rename to patches/server/0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch
diff --git a/patches/server/0040-Cows-eat-mushrooms.patch b/patches/server/0039-Cows-eat-mushrooms.patch
similarity index 100%
rename from patches/server/0040-Cows-eat-mushrooms.patch
rename to patches/server/0039-Cows-eat-mushrooms.patch
diff --git a/patches/server/0041-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0040-Fix-cow-rotation-when-shearing-mooshroom.patch
similarity index 100%
rename from patches/server/0041-Fix-cow-rotation-when-shearing-mooshroom.patch
rename to patches/server/0040-Fix-cow-rotation-when-shearing-mooshroom.patch
diff --git a/patches/server/0042-Pigs-give-saddle-back.patch b/patches/server/0041-Pigs-give-saddle-back.patch
similarity index 100%
rename from patches/server/0042-Pigs-give-saddle-back.patch
rename to patches/server/0041-Pigs-give-saddle-back.patch
diff --git a/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0042-Snowman-drop-and-put-back-pumpkin.patch
similarity index 100%
rename from patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch
rename to patches/server/0042-Snowman-drop-and-put-back-pumpkin.patch
diff --git a/patches/server/0044-Ender-dragon-always-drop-full-exp.patch b/patches/server/0043-Ender-dragon-always-drop-full-exp.patch
similarity index 100%
rename from patches/server/0044-Ender-dragon-always-drop-full-exp.patch
rename to patches/server/0043-Ender-dragon-always-drop-full-exp.patch
diff --git a/patches/server/0045-Signs-editable-on-right-click.patch b/patches/server/0044-Signs-editable-on-right-click.patch
similarity index 100%
rename from patches/server/0045-Signs-editable-on-right-click.patch
rename to patches/server/0044-Signs-editable-on-right-click.patch
diff --git a/patches/server/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0045-Allow-soil-to-moisten-from-water-directly-under-it.patch
similarity index 100%
rename from patches/server/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch
rename to patches/server/0045-Allow-soil-to-moisten-from-water-directly-under-it.patch
diff --git a/patches/server/0047-Minecart-settings-and-WASD-controls.patch b/patches/server/0046-Minecart-settings-and-WASD-controls.patch
similarity index 99%
rename from patches/server/0047-Minecart-settings-and-WASD-controls.patch
rename to patches/server/0046-Minecart-settings-and-WASD-controls.patch
index aaa1a4c4b..2b1a94c30 100644
--- a/patches/server/0047-Minecart-settings-and-WASD-controls.patch
+++ b/patches/server/0046-Minecart-settings-and-WASD-controls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Minecart settings and WASD controls
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e7399e71db7ca5671a4570f4e605497b2b2fa0cb..c8e81949a0f00e7feb0bd99bca5a0073b5f4add8 100644
+index 481e474f48d9409f4d8a337b334a17627c9b8ccb..de96a37827fd31f3189e18298e2f9e1370761a30 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1031,6 +1031,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0048-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0047-Disable-loot-drops-on-death-by-cramming.patch
similarity index 96%
rename from patches/server/0048-Disable-loot-drops-on-death-by-cramming.patch
rename to patches/server/0047-Disable-loot-drops-on-death-by-cramming.patch
index 3dad5dc16..c0cb7dcc4 100644
--- a/patches/server/0048-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/server/0047-Disable-loot-drops-on-death-by-cramming.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6c769141376f6995d6572d5e3cf3a999ff954e82..ccc034d345d4c7ea1b8317023e2e410d5c231ec9 100644
+index 9bb19e7a112c1411bb6b717de983c0359f6b0cb6..cb90fec7558923f547bab2d37ceffd67c07501ce 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1747,6 +1747,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0049-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0048-Option-to-toggle-milk-curing-bad-omen.patch
similarity index 100%
rename from patches/server/0049-Option-to-toggle-milk-curing-bad-omen.patch
rename to patches/server/0048-Option-to-toggle-milk-curing-bad-omen.patch
diff --git a/patches/server/0050-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0049-End-gateway-should-check-if-entity-can-use-portal.patch
similarity index 100%
rename from patches/server/0050-End-gateway-should-check-if-entity-can-use-portal.patch
rename to patches/server/0049-End-gateway-should-check-if-entity-can-use-portal.patch
diff --git a/patches/server/0051-Skip-events-if-there-s-no-listeners.patch b/patches/server/0050-Skip-events-if-there-s-no-listeners.patch
similarity index 93%
rename from patches/server/0051-Skip-events-if-there-s-no-listeners.patch
rename to patches/server/0050-Skip-events-if-there-s-no-listeners.patch
index 3b6f2f63a..2e20f4867 100644
--- a/patches/server/0051-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/server/0050-Skip-events-if-there-s-no-listeners.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Skip events if there's no listeners
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index a0f5aa8c3cfce63af9cb286278a7fdebd7aa3642..91bb48f66aad86c76b2e7d2e70e84ca0e1a50212 100644
+index fcc75660a69122eefc100e4de0a62f587bf97d7b..1ea357efcb8cdc275dabe3cb6b2c1a37aee45620 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -404,6 +404,7 @@ public class Commands {
diff --git a/patches/server/0052-Add-permission-for-F3-N-debug.patch b/patches/server/0051-Add-permission-for-F3-N-debug.patch
similarity index 89%
rename from patches/server/0052-Add-permission-for-F3-N-debug.patch
rename to patches/server/0051-Add-permission-for-F3-N-debug.patch
index dcb9bc14a..048914616 100644
--- a/patches/server/0052-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0051-Add-permission-for-F3-N-debug.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for F3+N debug
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 02707189e0cafcb8db31413566f2078495866434..51c3c2b943aa0b1503c7c0b8df658728d8cbe152 100644
+index fc27bdf91b946ac4c2a6e4adec3693fd0ea5324a..94d097941ae9fc720e22a1c9d5d2ce62c07fe078 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1187,6 +1187,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0053-Configurable-TPS-Catchup.patch b/patches/server/0052-Configurable-TPS-Catchup.patch
similarity index 95%
rename from patches/server/0053-Configurable-TPS-Catchup.patch
rename to patches/server/0052-Configurable-TPS-Catchup.patch
index 5653412de..dbc7df873 100644
--- a/patches/server/0053-Configurable-TPS-Catchup.patch
+++ b/patches/server/0052-Configurable-TPS-Catchup.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f4d332008924aff0e9c17e57d7d5876994af4b4b..96206433344397df133c18683f29d67e971b04ad 100644
+index 53096efdc2d2e27537e36259ebda9137100de846..8e6271f717451cb59aa11656879f0ccd3655a8a3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1195,7 +1195,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0054-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0053-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
similarity index 100%
rename from patches/server/0054-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
rename to patches/server/0053-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
diff --git a/patches/server/0055-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0054-Add-enderman-and-creeper-griefing-controls.patch
similarity index 97%
rename from patches/server/0055-Add-enderman-and-creeper-griefing-controls.patch
rename to patches/server/0054-Add-enderman-and-creeper-griefing-controls.patch
index 5c4607f25..d5d4775a5 100644
--- a/patches/server/0055-Add-enderman-and-creeper-griefing-controls.patch
+++ b/patches/server/0054-Add-enderman-and-creeper-griefing-controls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add enderman and creeper griefing controls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 2a5f7fb0e60f41b6627255146ca18b271ac6395f..9db014c82f6e8d1c64d592252b171683bd55c400 100644
+index 5b20eea9dd51498842599579b2f105e582ccec58..262dff21467fa6dc79126a96575a8fe9c49b9116 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -349,7 +349,7 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0056-Villagers-follow-emerald-blocks.patch b/patches/server/0055-Villagers-follow-emerald-blocks.patch
similarity index 100%
rename from patches/server/0056-Villagers-follow-emerald-blocks.patch
rename to patches/server/0055-Villagers-follow-emerald-blocks.patch
diff --git a/patches/server/0057-Allow-leashing-villagers.patch b/patches/server/0056-Allow-leashing-villagers.patch
similarity index 100%
rename from patches/server/0057-Allow-leashing-villagers.patch
rename to patches/server/0056-Allow-leashing-villagers.patch
diff --git a/patches/server/0058-Implement-infinite-liquids.patch b/patches/server/0057-Implement-infinite-liquids.patch
similarity index 100%
rename from patches/server/0058-Implement-infinite-liquids.patch
rename to patches/server/0057-Implement-infinite-liquids.patch
diff --git a/patches/server/0059-Make-lava-flow-speed-configurable.patch b/patches/server/0058-Make-lava-flow-speed-configurable.patch
similarity index 100%
rename from patches/server/0059-Make-lava-flow-speed-configurable.patch
rename to patches/server/0058-Make-lava-flow-speed-configurable.patch
diff --git a/patches/server/0060-Add-player-death-exp-control-options.patch b/patches/server/0059-Add-player-death-exp-control-options.patch
similarity index 100%
rename from patches/server/0060-Add-player-death-exp-control-options.patch
rename to patches/server/0059-Add-player-death-exp-control-options.patch
diff --git a/patches/server/0061-Configurable-void-damage-height-and-damage.patch b/patches/server/0060-Configurable-void-damage-height-and-damage.patch
similarity index 100%
rename from patches/server/0061-Configurable-void-damage-height-and-damage.patch
rename to patches/server/0060-Configurable-void-damage-height-and-damage.patch
diff --git a/patches/server/0062-Add-canSaveToDisk-to-Entity.patch b/patches/server/0061-Add-canSaveToDisk-to-Entity.patch
similarity index 100%
rename from patches/server/0062-Add-canSaveToDisk-to-Entity.patch
rename to patches/server/0061-Add-canSaveToDisk-to-Entity.patch
diff --git a/patches/server/0063-Dispenser-curse-of-binding-protection.patch b/patches/server/0062-Dispenser-curse-of-binding-protection.patch
similarity index 100%
rename from patches/server/0063-Dispenser-curse-of-binding-protection.patch
rename to patches/server/0062-Dispenser-curse-of-binding-protection.patch
diff --git a/patches/server/0064-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0063-Add-option-for-boats-to-eject-players-on-land.patch
similarity index 100%
rename from patches/server/0064-Add-option-for-boats-to-eject-players-on-land.patch
rename to patches/server/0063-Add-option-for-boats-to-eject-players-on-land.patch
diff --git a/patches/server/0065-Mending-mends-most-damages-equipment-first.patch b/patches/server/0064-Mending-mends-most-damages-equipment-first.patch
similarity index 100%
rename from patches/server/0065-Mending-mends-most-damages-equipment-first.patch
rename to patches/server/0064-Mending-mends-most-damages-equipment-first.patch
diff --git a/patches/server/0066-Add-5-second-tps-average-in-tps.patch b/patches/server/0065-Add-5-second-tps-average-in-tps.patch
similarity index 98%
rename from patches/server/0066-Add-5-second-tps-average-in-tps.patch
rename to patches/server/0065-Add-5-second-tps-average-in-tps.patch
index 581ddbf5d..529cd62fb 100644
--- a/patches/server/0066-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0065-Add-5-second-tps-average-in-tps.patch
@@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
          setListData(vector);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 96206433344397df133c18683f29d67e971b04ad..01dd92847b211b53356d457e0cf7e1170b0cb8dd 100644
+index 8e6271f717451cb59aa11656879f0ccd3655a8a3..68bc5f7e3747592f28ef6fdfa5d9e009a08afd9b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -290,7 +290,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0067-Implement-elytra-settings.patch b/patches/server/0066-Implement-elytra-settings.patch
similarity index 100%
rename from patches/server/0067-Implement-elytra-settings.patch
rename to patches/server/0066-Implement-elytra-settings.patch
diff --git a/patches/server/0068-Item-entity-immunities.patch b/patches/server/0067-Item-entity-immunities.patch
similarity index 98%
rename from patches/server/0068-Item-entity-immunities.patch
rename to patches/server/0067-Item-entity-immunities.patch
index e9e097fc7..ab9569d2f 100644
--- a/patches/server/0068-Item-entity-immunities.patch
+++ b/patches/server/0067-Item-entity-immunities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 871bce7f5acc1b9a058496f41d962ec2e724f620..9bfd1cb300fe7f76e9a36167390ab1c2b468b100 100644
+index 88152988425b7b02ec5ce229ba4c24b40e030329..78c01b08ff8683960d1d227523ca6cecf56c06b1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -65,7 +65,7 @@ public class ServerEntity {
diff --git a/patches/server/0069-Add-ping-command.patch b/patches/server/0068-Add-ping-command.patch
similarity index 97%
rename from patches/server/0069-Add-ping-command.patch
rename to patches/server/0068-Add-ping-command.patch
index 9ee1d0958..24ef20e8c 100644
--- a/patches/server/0069-Add-ping-command.patch
+++ b/patches/server/0068-Add-ping-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ping command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 91bb48f66aad86c76b2e7d2e70e84ca0e1a50212..43a79d4c1a26f91ceac33e6feb53b7d958f8cc4d 100644
+index 1ea357efcb8cdc275dabe3cb6b2c1a37aee45620..24086234a7185e7c530e40af0481a0184e8226e9 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -208,6 +208,7 @@ public class Commands {
diff --git a/patches/server/0070-Add-demo-command.patch b/patches/server/0069-Add-demo-command.patch
similarity index 97%
rename from patches/server/0070-Add-demo-command.patch
rename to patches/server/0069-Add-demo-command.patch
index 1d5aa9672..8de67bd5c 100644
--- a/patches/server/0070-Add-demo-command.patch
+++ b/patches/server/0069-Add-demo-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add demo command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 43a79d4c1a26f91ceac33e6feb53b7d958f8cc4d..66dd8aedabcf7d994a4438c4bdaa659dcb47f811 100644
+index 24086234a7185e7c530e40af0481a0184e8226e9..0500c6274300bd5809fb1fcfb49fa1f37801d74a 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -208,6 +208,7 @@ public class Commands {
diff --git a/patches/server/0071-Add-credits-command.patch b/patches/server/0070-Add-credits-command.patch
similarity index 97%
rename from patches/server/0071-Add-credits-command.patch
rename to patches/server/0070-Add-credits-command.patch
index 0c6eb3e8f..cb877a6a3 100644
--- a/patches/server/0071-Add-credits-command.patch
+++ b/patches/server/0070-Add-credits-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add credits command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 66dd8aedabcf7d994a4438c4bdaa659dcb47f811..2fa8babafb53cb33272c25f5e0dc31ff2f954c42 100644
+index 0500c6274300bd5809fb1fcfb49fa1f37801d74a..55b1ebd17af11ac29fb6b1d4572fb1fc260c16ac 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -208,6 +208,7 @@ public class Commands {
diff --git a/patches/server/0072-Configurable-jockey-options.patch b/patches/server/0071-Configurable-jockey-options.patch
similarity index 100%
rename from patches/server/0072-Configurable-jockey-options.patch
rename to patches/server/0071-Configurable-jockey-options.patch
diff --git a/patches/server/0073-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0072-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 100%
rename from patches/server/0073-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/server/0072-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
diff --git a/patches/server/0074-Add-phantom-spawning-options.patch b/patches/server/0073-Add-phantom-spawning-options.patch
similarity index 100%
rename from patches/server/0074-Add-phantom-spawning-options.patch
rename to patches/server/0073-Add-phantom-spawning-options.patch
diff --git a/patches/server/0075-Implement-bed-explosion-options.patch b/patches/server/0074-Implement-bed-explosion-options.patch
similarity index 100%
rename from patches/server/0075-Implement-bed-explosion-options.patch
rename to patches/server/0074-Implement-bed-explosion-options.patch
diff --git a/patches/server/0076-Implement-respawn-anchor-explosion-options.patch b/patches/server/0075-Implement-respawn-anchor-explosion-options.patch
similarity index 100%
rename from patches/server/0076-Implement-respawn-anchor-explosion-options.patch
rename to patches/server/0075-Implement-respawn-anchor-explosion-options.patch
diff --git a/patches/server/0077-Add-allow-water-in-end-world-option.patch b/patches/server/0076-Add-allow-water-in-end-world-option.patch
similarity index 98%
rename from patches/server/0077-Add-allow-water-in-end-world-option.patch
rename to patches/server/0076-Add-allow-water-in-end-world-option.patch
index 52b762143..ce02a3db3 100644
--- a/patches/server/0077-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0076-Add-allow-water-in-end-world-option.patch
@@ -27,7 +27,7 @@ index 73f1211470d9626c82c8345037da19aed9db3f23..40c7bf266eccc43faa081ade9402bee5
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a1d9994c39e19a942b0bc605bed1413498e6df16..765653976492ff63b325f0538b2fdd579a9e0019 100644
+index 9d68706d23da00700a89b533e9efefa328196064..a249430e34addd26a3fb49913ea9efe0f3d1b7b6 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1570,4 +1570,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0078-Allow-color-codes-in-books.patch b/patches/server/0077-Allow-color-codes-in-books.patch
similarity index 97%
rename from patches/server/0078-Allow-color-codes-in-books.patch
rename to patches/server/0077-Allow-color-codes-in-books.patch
index 1c7eafbed..ead51439d 100644
--- a/patches/server/0078-Allow-color-codes-in-books.patch
+++ b/patches/server/0077-Allow-color-codes-in-books.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 34e07a31d70854b8ed8a955f296b9e4e5da6cedc..28146fe7c892c42dd187fc6163eed4ae5ff204ec 100644
+index b996a4903fcbaf308ff141b9c05d516832fcee47..0f90a7be083723e72dc6f24087f981790dd98eec 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1345,13 +1345,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0079-Entity-lifespan.patch b/patches/server/0078-Entity-lifespan.patch
similarity index 100%
rename from patches/server/0079-Entity-lifespan.patch
rename to patches/server/0078-Entity-lifespan.patch
diff --git a/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0079-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
similarity index 100%
rename from patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
rename to patches/server/0079-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
diff --git a/patches/server/0081-Squid-EAR-immunity.patch b/patches/server/0080-Squid-EAR-immunity.patch
similarity index 100%
rename from patches/server/0081-Squid-EAR-immunity.patch
rename to patches/server/0080-Squid-EAR-immunity.patch
diff --git a/patches/server/0082-Phantoms-burn-in-light.patch b/patches/server/0081-Phantoms-burn-in-light.patch
similarity index 100%
rename from patches/server/0082-Phantoms-burn-in-light.patch
rename to patches/server/0081-Phantoms-burn-in-light.patch
diff --git a/patches/server/0083-Configurable-villager-breeding.patch b/patches/server/0082-Configurable-villager-breeding.patch
similarity index 100%
rename from patches/server/0083-Configurable-villager-breeding.patch
rename to patches/server/0082-Configurable-villager-breeding.patch
diff --git a/patches/server/0084-Redstone-deactivates-spawners.patch b/patches/server/0083-Redstone-deactivates-spawners.patch
similarity index 100%
rename from patches/server/0084-Redstone-deactivates-spawners.patch
rename to patches/server/0083-Redstone-deactivates-spawners.patch
diff --git a/patches/server/0085-Totems-work-in-inventory.patch b/patches/server/0084-Totems-work-in-inventory.patch
similarity index 100%
rename from patches/server/0085-Totems-work-in-inventory.patch
rename to patches/server/0084-Totems-work-in-inventory.patch
diff --git a/patches/server/0086-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0085-Add-vindicator-johnny-spawn-chance.patch
similarity index 100%
rename from patches/server/0086-Add-vindicator-johnny-spawn-chance.patch
rename to patches/server/0085-Add-vindicator-johnny-spawn-chance.patch
diff --git a/patches/server/0087-Add-option-to-disable-certain-block-updates.patch b/patches/server/0086-Add-option-to-disable-certain-block-updates.patch
similarity index 100%
rename from patches/server/0087-Add-option-to-disable-certain-block-updates.patch
rename to patches/server/0086-Add-option-to-disable-certain-block-updates.patch
diff --git a/patches/server/0088-Dispensers-place-anvils-option.patch b/patches/server/0087-Dispensers-place-anvils-option.patch
similarity index 100%
rename from patches/server/0088-Dispensers-place-anvils-option.patch
rename to patches/server/0087-Dispensers-place-anvils-option.patch
diff --git a/patches/server/0089-Allow-anvil-colors.patch b/patches/server/0088-Allow-anvil-colors.patch
similarity index 100%
rename from patches/server/0089-Allow-anvil-colors.patch
rename to patches/server/0088-Allow-anvil-colors.patch
diff --git a/patches/server/0090-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0089-Add-option-to-disable-dolphin-treasure-searching.patch
similarity index 100%
rename from patches/server/0090-Add-option-to-disable-dolphin-treasure-searching.patch
rename to patches/server/0089-Add-option-to-disable-dolphin-treasure-searching.patch
diff --git a/patches/server/0091-Short-enderman-height.patch b/patches/server/0090-Short-enderman-height.patch
similarity index 100%
rename from patches/server/0091-Short-enderman-height.patch
rename to patches/server/0090-Short-enderman-height.patch
diff --git a/patches/server/0092-Stop-squids-floating-on-top-of-water.patch b/patches/server/0091-Stop-squids-floating-on-top-of-water.patch
similarity index 100%
rename from patches/server/0092-Stop-squids-floating-on-top-of-water.patch
rename to patches/server/0091-Stop-squids-floating-on-top-of-water.patch
diff --git a/patches/server/0093-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0092-Crying-obsidian-valid-for-portal-frames.patch
similarity index 100%
rename from patches/server/0093-Crying-obsidian-valid-for-portal-frames.patch
rename to patches/server/0092-Crying-obsidian-valid-for-portal-frames.patch
diff --git a/patches/server/0094-Entities-can-use-portals-configuration.patch b/patches/server/0093-Entities-can-use-portals-configuration.patch
similarity index 100%
rename from patches/server/0094-Entities-can-use-portals-configuration.patch
rename to patches/server/0093-Entities-can-use-portals-configuration.patch
diff --git a/patches/server/0095-LivingEntity-broadcastItemBreak.patch b/patches/server/0094-LivingEntity-broadcastItemBreak.patch
similarity index 100%
rename from patches/server/0095-LivingEntity-broadcastItemBreak.patch
rename to patches/server/0094-LivingEntity-broadcastItemBreak.patch
diff --git a/patches/server/0096-Customizable-wither-health-and-healing.patch b/patches/server/0095-Customizable-wither-health-and-healing.patch
similarity index 100%
rename from patches/server/0096-Customizable-wither-health-and-healing.patch
rename to patches/server/0095-Customizable-wither-health-and-healing.patch
diff --git a/patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0096-Allow-toggling-special-MobSpawners-per-world.patch
similarity index 100%
rename from patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch
rename to patches/server/0096-Allow-toggling-special-MobSpawners-per-world.patch
diff --git a/patches/server/0098-Raid-cooldown-setting.patch b/patches/server/0097-Raid-cooldown-setting.patch
similarity index 100%
rename from patches/server/0098-Raid-cooldown-setting.patch
rename to patches/server/0097-Raid-cooldown-setting.patch
diff --git a/patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0098-Despawn-rate-config-options-per-projectile-type.patch
similarity index 97%
rename from patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch
rename to patches/server/0098-Despawn-rate-config-options-per-projectile-type.patch
index 8567934f9..3344177a2 100644
--- a/patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch
+++ b/patches/server/0098-Despawn-rate-config-options-per-projectile-type.patch
@@ -7,7 +7,7 @@ This patch's implementation has been removed in favor of Pufferfish's entity-tim
 The config remains for migration purposes.
 
 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-index 09827eaa9f6adf49385a33aa60b3a6bf4005a982..95995c7f7e035bac7a4f429d84bb44fec41e01f9 100644
+index 38cb29c646ff496ffaa6553f98a565b71155c464..e077a43cf3f06207234cb445b58dff79eabcb9c6 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 @@ -121,6 +121,22 @@ public class PufferfishConfig {
diff --git a/patches/server/0100-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0099-Add-option-to-disable-zombie-aggressiveness-towards-.patch
similarity index 100%
rename from patches/server/0100-Add-option-to-disable-zombie-aggressiveness-towards-.patch
rename to patches/server/0099-Add-option-to-disable-zombie-aggressiveness-towards-.patch
diff --git a/patches/server/0101-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0100-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
similarity index 100%
rename from patches/server/0101-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
rename to patches/server/0100-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
diff --git a/patches/server/0102-Flying-squids-Oh-my.patch b/patches/server/0101-Flying-squids-Oh-my.patch
similarity index 100%
rename from patches/server/0102-Flying-squids-Oh-my.patch
rename to patches/server/0101-Flying-squids-Oh-my.patch
diff --git a/patches/server/0103-Infinity-bow-settings.patch b/patches/server/0102-Infinity-bow-settings.patch
similarity index 100%
rename from patches/server/0103-Infinity-bow-settings.patch
rename to patches/server/0102-Infinity-bow-settings.patch
diff --git a/patches/server/0104-Configurable-daylight-cycle.patch b/patches/server/0103-Configurable-daylight-cycle.patch
similarity index 98%
rename from patches/server/0104-Configurable-daylight-cycle.patch
rename to patches/server/0103-Configurable-daylight-cycle.patch
index ad8283bf7..355d94c71 100644
--- a/patches/server/0104-Configurable-daylight-cycle.patch
+++ b/patches/server/0103-Configurable-daylight-cycle.patch
@@ -18,7 +18,7 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe
      public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
          this.gameTime = time % 192000; // Paper - fix guardian beam
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 01dd92847b211b53356d457e0cf7e1170b0cb8dd..cde48cbdce50e38e07eaaf81cc922bf39e1fa87f 100644
+index 68bc5f7e3747592f28ef6fdfa5d9e009a08afd9b..2ee6df3e1a79047de97f4776c6f7e2e549d78c68 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1529,7 +1529,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0105-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0104-Allow-infinite-and-mending-enchantments-together.patch
similarity index 100%
rename from patches/server/0105-Allow-infinite-and-mending-enchantments-together.patch
rename to patches/server/0104-Allow-infinite-and-mending-enchantments-together.patch
diff --git a/patches/server/0106-Furnace-uses-lava-from-underneath.patch b/patches/server/0105-Furnace-uses-lava-from-underneath.patch
similarity index 100%
rename from patches/server/0106-Furnace-uses-lava-from-underneath.patch
rename to patches/server/0105-Furnace-uses-lava-from-underneath.patch
diff --git a/patches/server/0107-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0106-Arrows-should-not-reset-despawn-counter.patch
similarity index 100%
rename from patches/server/0107-Arrows-should-not-reset-despawn-counter.patch
rename to patches/server/0106-Arrows-should-not-reset-despawn-counter.patch
diff --git a/patches/server/0108-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0107-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
similarity index 100%
rename from patches/server/0108-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
rename to patches/server/0107-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
diff --git a/patches/server/0109-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0108-Add-adjustable-breeding-cooldown-to-config.patch
similarity index 98%
rename from patches/server/0109-Add-adjustable-breeding-cooldown-to-config.patch
rename to patches/server/0108-Add-adjustable-breeding-cooldown-to-config.patch
index 37cacb72a..cd315ed3c 100644
--- a/patches/server/0109-Add-adjustable-breeding-cooldown-to-config.patch
+++ b/patches/server/0108-Add-adjustable-breeding-cooldown-to-config.patch
@@ -33,7 +33,7 @@ index 6216513805add7c8f52e1ed6c77e2d26786b3ab5..34e82b97c5b294f0a6423581220403a1
              entityageable.setBaby(true);
              entityageable.moveTo(this.getX(), this.getY(), this.getZ(), 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 765653976492ff63b325f0538b2fdd579a9e0019..0dab4ef279f7e9af64290395b4af205b0d54f271 100644
+index a249430e34addd26a3fb49913ea9efe0f3d1b7b6..824f3dfaf2ba6f064efaa7939b990023de1f1448 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -193,6 +193,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0110-Make-entity-breeding-times-configurable.patch b/patches/server/0109-Make-entity-breeding-times-configurable.patch
similarity index 100%
rename from patches/server/0110-Make-entity-breeding-times-configurable.patch
rename to patches/server/0109-Make-entity-breeding-times-configurable.patch
diff --git a/patches/server/0111-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0110-Apply-display-names-from-item-forms-of-entities-to-e.patch
similarity index 100%
rename from patches/server/0111-Apply-display-names-from-item-forms-of-entities-to-e.patch
rename to patches/server/0110-Apply-display-names-from-item-forms-of-entities-to-e.patch
diff --git a/patches/server/0112-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0111-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
similarity index 100%
rename from patches/server/0112-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
rename to patches/server/0111-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
diff --git a/patches/server/0113-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0112-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
similarity index 100%
rename from patches/server/0113-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
rename to patches/server/0112-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
diff --git a/patches/server/0114-Add-configurable-snowball-damage.patch b/patches/server/0113-Add-configurable-snowball-damage.patch
similarity index 100%
rename from patches/server/0114-Add-configurable-snowball-damage.patch
rename to patches/server/0113-Add-configurable-snowball-damage.patch
diff --git a/patches/server/0115-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0114-Changeable-Mob-Left-Handed-Chance.patch
similarity index 100%
rename from patches/server/0115-Changeable-Mob-Left-Handed-Chance.patch
rename to patches/server/0114-Changeable-Mob-Left-Handed-Chance.patch
diff --git a/patches/server/0116-Add-boat-fall-damage-config.patch b/patches/server/0115-Add-boat-fall-damage-config.patch
similarity index 97%
rename from patches/server/0116-Add-boat-fall-damage-config.patch
rename to patches/server/0115-Add-boat-fall-damage-config.patch
index b19609867..314ddf5c4 100644
--- a/patches/server/0116-Add-boat-fall-damage-config.patch
+++ b/patches/server/0115-Add-boat-fall-damage-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2f9a02d0eecd09a15bb71ed85de28ef2cd36127d..ee85918725ef2176c79b33bd12e3ed38d89f69e0 100644
+index 0d30b21ec070980b290f23d5becfc61183214146..9296eedcb77dcb7068d7816cd10459d48e93ebba 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1031,7 +1031,16 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0117-Snow-Golem-rate-of-fire-config.patch b/patches/server/0116-Snow-Golem-rate-of-fire-config.patch
similarity index 100%
rename from patches/server/0117-Snow-Golem-rate-of-fire-config.patch
rename to patches/server/0116-Snow-Golem-rate-of-fire-config.patch
diff --git a/patches/server/0118-EMC-Configurable-disable-give-dropping.patch b/patches/server/0117-EMC-Configurable-disable-give-dropping.patch
similarity index 100%
rename from patches/server/0118-EMC-Configurable-disable-give-dropping.patch
rename to patches/server/0117-EMC-Configurable-disable-give-dropping.patch
diff --git a/patches/server/0119-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0118-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
similarity index 100%
rename from patches/server/0119-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
rename to patches/server/0118-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
diff --git a/patches/server/0120-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0119-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
similarity index 100%
rename from patches/server/0120-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
rename to patches/server/0119-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
diff --git a/patches/server/0121-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0120-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
similarity index 96%
rename from patches/server/0121-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
rename to patches/server/0120-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
index 4629011a5..80e6d133c 100644
--- a/patches/server/0121-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
+++ b/patches/server/0120-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Spread out and optimise player list ticksSpread out and
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 51c3c2b943aa0b1503c7c0b8df658728d8cbe152..7b617767451d5fa7e6d5b6777deb39d9d126695e 100644
+index 94d097941ae9fc720e22a1c9d5d2ce62c07fe078..4b1c9e75bb4148335a106083dd8199fa1f7d808d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1022,22 +1022,22 @@ public abstract class PlayerList {
diff --git a/patches/server/0122-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0121-Configurable-chance-for-wolves-to-spawn-rabid.patch
similarity index 100%
rename from patches/server/0122-Configurable-chance-for-wolves-to-spawn-rabid.patch
rename to patches/server/0121-Configurable-chance-for-wolves-to-spawn-rabid.patch
diff --git a/patches/server/0123-Configurable-default-collar-color.patch b/patches/server/0122-Configurable-default-collar-color.patch
similarity index 100%
rename from patches/server/0123-Configurable-default-collar-color.patch
rename to patches/server/0122-Configurable-default-collar-color.patch
diff --git a/patches/server/0124-Phantom-flames-on-swoop.patch b/patches/server/0123-Phantom-flames-on-swoop.patch
similarity index 100%
rename from patches/server/0124-Phantom-flames-on-swoop.patch
rename to patches/server/0123-Phantom-flames-on-swoop.patch
diff --git a/patches/server/0125-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0124-Option-for-chests-to-open-even-with-a-solid-block-on.patch
similarity index 100%
rename from patches/server/0125-Option-for-chests-to-open-even-with-a-solid-block-on.patch
rename to patches/server/0124-Option-for-chests-to-open-even-with-a-solid-block-on.patch
diff --git a/patches/server/0126-Implement-TPSBar.patch b/patches/server/0125-Implement-TPSBar.patch
similarity index 100%
rename from patches/server/0126-Implement-TPSBar.patch
rename to patches/server/0125-Implement-TPSBar.patch
diff --git a/patches/server/0127-Striders-give-saddle-back.patch b/patches/server/0126-Striders-give-saddle-back.patch
similarity index 100%
rename from patches/server/0127-Striders-give-saddle-back.patch
rename to patches/server/0126-Striders-give-saddle-back.patch
diff --git a/patches/server/0128-PlayerBookTooLargeEvent.patch b/patches/server/0127-PlayerBookTooLargeEvent.patch
similarity index 96%
rename from patches/server/0128-PlayerBookTooLargeEvent.patch
rename to patches/server/0127-PlayerBookTooLargeEvent.patch
index d076b8e83..d004235a2 100644
--- a/patches/server/0128-PlayerBookTooLargeEvent.patch
+++ b/patches/server/0127-PlayerBookTooLargeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0d110bed21eda6f8c28a495aa7b88fac786f47d8..e47532b91f012562754a42de6b26cca54cbea374 100644
+index 666c5b9792da335bc85a964b15296fcecbf4d43f..57ffb4b246f38d81e19e0f369a245b6beb2b6d41 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1265,10 +1265,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0129-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0128-Full-netherite-armor-grants-fire-resistance.patch
similarity index 100%
rename from patches/server/0129-Full-netherite-armor-grants-fire-resistance.patch
rename to patches/server/0128-Full-netherite-armor-grants-fire-resistance.patch
diff --git a/patches/server/0130-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0129-Fix-rotating-UP-DOWN-CW-and-CCW.patch
similarity index 100%
rename from patches/server/0130-Fix-rotating-UP-DOWN-CW-and-CCW.patch
rename to patches/server/0129-Fix-rotating-UP-DOWN-CW-and-CCW.patch
diff --git a/patches/server/0131-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch
similarity index 99%
rename from patches/server/0131-Add-mobGriefing-bypass-to-everything-affected.patch
rename to patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch
index d10f91ca9..f848d03f5 100644
--- a/patches/server/0131-Add-mobGriefing-bypass-to-everything-affected.patch
+++ b/patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch
@@ -166,7 +166,7 @@ index c39e6ab8ffb850eb6ba783d237daad7e011a03bc..2207c5a71b8a3c7c0c68388ec744c527
                      j = Mth.floor(this.getX());
                      int i1 = Mth.floor(this.getZ());
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 9db014c82f6e8d1c64d592252b171683bd55c400..6acdd443e1e9d59efab8966f5f3ddbfb7be72336 100644
+index 262dff21467fa6dc79126a96575a8fe9c49b9116..e5b8e09bfb03663afb19214b2759df30fe448704 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -349,7 +349,7 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0132-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0131-Config-to-allow-Note-Block-sounds-when-blocked.patch
similarity index 100%
rename from patches/server/0132-Config-to-allow-Note-Block-sounds-when-blocked.patch
rename to patches/server/0131-Config-to-allow-Note-Block-sounds-when-blocked.patch
diff --git a/patches/server/0133-Add-EntityTeleportHinderedEvent.patch b/patches/server/0132-Add-EntityTeleportHinderedEvent.patch
similarity index 99%
rename from patches/server/0133-Add-EntityTeleportHinderedEvent.patch
rename to patches/server/0132-Add-EntityTeleportHinderedEvent.patch
index 0f1587a4d..fc613c0cc 100644
--- a/patches/server/0133-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0132-Add-EntityTeleportHinderedEvent.patch
@@ -78,7 +78,7 @@ index 5c7e30eb5e8a2a1ab18750a2cd2ec7364e8c52e0..ecd0ba252feb57cb1d60745e7750a676
  
              blockEntity.teleportCooldown = 100;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b8cb317246b1f07c193abac9b5c84acdfe9ef958..3c3c9578f511987f8c237306647d04e8b57099e1 100644
+index 11d51beb52c326a9fc040322a79d3916a8ddd0a2..240d7cfc0c5f5e3d3c53388f034a1b1faf9a4dfe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -593,6 +593,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0134-Farmland-trampling-changes.patch b/patches/server/0133-Farmland-trampling-changes.patch
similarity index 100%
rename from patches/server/0134-Farmland-trampling-changes.patch
rename to patches/server/0133-Farmland-trampling-changes.patch
diff --git a/patches/server/0135-Movement-options-for-armor-stands.patch b/patches/server/0134-Movement-options-for-armor-stands.patch
similarity index 100%
rename from patches/server/0135-Movement-options-for-armor-stands.patch
rename to patches/server/0134-Movement-options-for-armor-stands.patch
diff --git a/patches/server/0136-Fix-stuck-in-portals.patch b/patches/server/0135-Fix-stuck-in-portals.patch
similarity index 97%
rename from patches/server/0136-Fix-stuck-in-portals.patch
rename to patches/server/0135-Fix-stuck-in-portals.patch
index 004f4378e..df831bdc7 100644
--- a/patches/server/0136-Fix-stuck-in-portals.patch
+++ b/patches/server/0135-Fix-stuck-in-portals.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a57e0a37a3cacbfea82a3dcc4646dd2fd0977e33..7e2081b189bca551b32ce22c5881cf56bb3893cb 100644
+index b7f93bd215b01be450e2a1a58aadf84ccf811525..5406bff8bc2e194c93076f1d8d51f75f8c6e57d3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1184,6 +1184,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0137-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0136-Toggle-for-water-sensitive-mob-damage.patch
similarity index 99%
rename from patches/server/0137-Toggle-for-water-sensitive-mob-damage.patch
rename to patches/server/0136-Toggle-for-water-sensitive-mob-damage.patch
index 08f8e47f5..a01fab0e3 100644
--- a/patches/server/0137-Toggle-for-water-sensitive-mob-damage.patch
+++ b/patches/server/0136-Toggle-for-water-sensitive-mob-damage.patch
@@ -625,7 +625,7 @@ index b9ee6fdaad09c92fdeea2e5be606818278a77c21..5347ba12f2a07601c9f044081e5e6ce6
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 6acdd443e1e9d59efab8966f5f3ddbfb7be72336..fa4d5579dcdaad04fa2e6cd9ae47af1154739121 100644
+index e5b8e09bfb03663afb19214b2759df30fe448704..6de0dccb7a70d9ebde7a518f820258a445bed000 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -151,6 +151,11 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0138-Config-to-always-tame-in-Creative.patch b/patches/server/0137-Config-to-always-tame-in-Creative.patch
similarity index 100%
rename from patches/server/0138-Config-to-always-tame-in-Creative.patch
rename to patches/server/0137-Config-to-always-tame-in-Creative.patch
diff --git a/patches/server/0139-End-crystal-explosion-options.patch b/patches/server/0138-End-crystal-explosion-options.patch
similarity index 100%
rename from patches/server/0139-End-crystal-explosion-options.patch
rename to patches/server/0138-End-crystal-explosion-options.patch
diff --git a/patches/server/0140-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0139-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
similarity index 100%
rename from patches/server/0140-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
rename to patches/server/0139-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
diff --git a/patches/server/0141-Dont-run-with-scissors.patch b/patches/server/0140-Dont-run-with-scissors.patch
similarity index 98%
rename from patches/server/0141-Dont-run-with-scissors.patch
rename to patches/server/0140-Dont-run-with-scissors.patch
index f47c7c52a..88ad9b00f 100644
--- a/patches/server/0141-Dont-run-with-scissors.patch
+++ b/patches/server/0140-Dont-run-with-scissors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors!
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e47532b91f012562754a42de6b26cca54cbea374..ead6b7246b142304dc52cdd3157a0b113645c641 100644
+index 57ffb4b246f38d81e19e0f369a245b6beb2b6d41..72422e08da8bb07181b777b073d12b0c87e2b8ea 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1699,6 +1699,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0142-One-Punch-Man.patch b/patches/server/0141-One-Punch-Man.patch
similarity index 100%
rename from patches/server/0142-One-Punch-Man.patch
rename to patches/server/0141-One-Punch-Man.patch
diff --git a/patches/server/0143-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0142-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
similarity index 100%
rename from patches/server/0143-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
rename to patches/server/0142-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
diff --git a/patches/server/0144-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0143-Config-to-ignore-nearby-mobs-when-sleeping.patch
similarity index 96%
rename from patches/server/0144-Config-to-ignore-nearby-mobs-when-sleeping.patch
rename to patches/server/0143-Config-to-ignore-nearby-mobs-when-sleeping.patch
index 352c03a0b..f52a0a23c 100644
--- a/patches/server/0144-Config-to-ignore-nearby-mobs-when-sleeping.patch
+++ b/patches/server/0143-Config-to-ignore-nearby-mobs-when-sleeping.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 7e2081b189bca551b32ce22c5881cf56bb3893cb..60eca993bfe5a9e1e044f29cb307ba091626a080 100644
+index 5406bff8bc2e194c93076f1d8d51f75f8c6e57d3..5d27110793a95118fae2e671e6f9cdede0763216 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1340,7 +1340,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0145-Add-back-player-spawned-endermite-API.patch b/patches/server/0144-Add-back-player-spawned-endermite-API.patch
similarity index 100%
rename from patches/server/0145-Add-back-player-spawned-endermite-API.patch
rename to patches/server/0144-Add-back-player-spawned-endermite-API.patch
diff --git a/patches/server/0146-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0145-Config-Enderman-aggressiveness-towards-Endermites.patch
similarity index 100%
rename from patches/server/0146-Config-Enderman-aggressiveness-towards-Endermites.patch
rename to patches/server/0145-Config-Enderman-aggressiveness-towards-Endermites.patch
diff --git a/patches/server/0147-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0146-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
similarity index 100%
rename from patches/server/0147-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
rename to patches/server/0146-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
diff --git a/patches/server/0148-Tick-fluids-config.patch b/patches/server/0147-Tick-fluids-config.patch
similarity index 100%
rename from patches/server/0148-Tick-fluids-config.patch
rename to patches/server/0147-Tick-fluids-config.patch
diff --git a/patches/server/0149-Config-to-disable-Llama-caravans.patch b/patches/server/0148-Config-to-disable-Llama-caravans.patch
similarity index 100%
rename from patches/server/0149-Config-to-disable-Llama-caravans.patch
rename to patches/server/0148-Config-to-disable-Llama-caravans.patch
diff --git a/patches/server/0150-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0149-Config-to-make-Creepers-explode-on-death.patch
similarity index 97%
rename from patches/server/0150-Config-to-make-Creepers-explode-on-death.patch
rename to patches/server/0149-Config-to-make-Creepers-explode-on-death.patch
index d62203679..dd6b77144 100644
--- a/patches/server/0150-Config-to-make-Creepers-explode-on-death.patch
+++ b/patches/server/0149-Config-to-make-Creepers-explode-on-death.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Config to make Creepers explode on death
 Creepers exploded after being killed in the alpha days. This brings that back.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index fa4d5579dcdaad04fa2e6cd9ae47af1154739121..bd58b7d364b5e0361e7b8c67d1b26b7f8d3906d3 100644
+index 6de0dccb7a70d9ebde7a518f820258a445bed000..2ffa10ddd1a19aa44c088a41fdfcbd596e493791 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -64,6 +64,7 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0151-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0150-Configurable-ravager-griefable-blocks-list.patch
similarity index 100%
rename from patches/server/0151-Configurable-ravager-griefable-blocks-list.patch
rename to patches/server/0150-Configurable-ravager-griefable-blocks-list.patch
diff --git a/patches/server/0152-Sneak-to-bulk-process-composter.patch b/patches/server/0151-Sneak-to-bulk-process-composter.patch
similarity index 100%
rename from patches/server/0152-Sneak-to-bulk-process-composter.patch
rename to patches/server/0151-Sneak-to-bulk-process-composter.patch
diff --git a/patches/server/0153-Config-for-skipping-night.patch b/patches/server/0152-Config-for-skipping-night.patch
similarity index 100%
rename from patches/server/0153-Config-for-skipping-night.patch
rename to patches/server/0152-Config-for-skipping-night.patch
diff --git a/patches/server/0154-Add-config-for-villager-trading.patch b/patches/server/0153-Add-config-for-villager-trading.patch
similarity index 100%
rename from patches/server/0154-Add-config-for-villager-trading.patch
rename to patches/server/0153-Add-config-for-villager-trading.patch
diff --git a/patches/server/0155-Allow-infinity-on-crossbows.patch b/patches/server/0154-Allow-infinity-on-crossbows.patch
similarity index 100%
rename from patches/server/0155-Allow-infinity-on-crossbows.patch
rename to patches/server/0154-Allow-infinity-on-crossbows.patch
diff --git a/patches/server/0156-Drowning-Settings.patch b/patches/server/0155-Drowning-Settings.patch
similarity index 100%
rename from patches/server/0156-Drowning-Settings.patch
rename to patches/server/0155-Drowning-Settings.patch
diff --git a/patches/server/0157-Break-individual-slabs-when-sneaking.patch b/patches/server/0156-Break-individual-slabs-when-sneaking.patch
similarity index 100%
rename from patches/server/0157-Break-individual-slabs-when-sneaking.patch
rename to patches/server/0156-Break-individual-slabs-when-sneaking.patch
diff --git a/patches/server/0158-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0157-Config-to-disable-hostile-mob-spawn-on-ice.patch
similarity index 100%
rename from patches/server/0158-Config-to-disable-hostile-mob-spawn-on-ice.patch
rename to patches/server/0157-Config-to-disable-hostile-mob-spawn-on-ice.patch
diff --git a/patches/server/0159-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0158-Config-to-show-Armor-Stand-arms-on-spawn.patch
similarity index 100%
rename from patches/server/0159-Config-to-show-Armor-Stand-arms-on-spawn.patch
rename to patches/server/0158-Config-to-show-Armor-Stand-arms-on-spawn.patch
diff --git a/patches/server/0160-Option-to-make-doors-require-redstone.patch b/patches/server/0159-Option-to-make-doors-require-redstone.patch
similarity index 100%
rename from patches/server/0160-Option-to-make-doors-require-redstone.patch
rename to patches/server/0159-Option-to-make-doors-require-redstone.patch
diff --git a/patches/server/0161-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0160-Config-to-allow-for-unsafe-enchants.patch
similarity index 100%
rename from patches/server/0161-Config-to-allow-for-unsafe-enchants.patch
rename to patches/server/0160-Config-to-allow-for-unsafe-enchants.patch
diff --git a/patches/server/0162-Configurable-sponge-absorption.patch b/patches/server/0161-Configurable-sponge-absorption.patch
similarity index 100%
rename from patches/server/0162-Configurable-sponge-absorption.patch
rename to patches/server/0161-Configurable-sponge-absorption.patch
diff --git a/patches/server/0163-Projectile-offset-config.patch b/patches/server/0162-Projectile-offset-config.patch
similarity index 100%
rename from patches/server/0163-Projectile-offset-config.patch
rename to patches/server/0162-Projectile-offset-config.patch
diff --git a/patches/server/0164-Config-for-powered-rail-activation-distance.patch b/patches/server/0163-Config-for-powered-rail-activation-distance.patch
similarity index 100%
rename from patches/server/0164-Config-for-powered-rail-activation-distance.patch
rename to patches/server/0163-Config-for-powered-rail-activation-distance.patch
diff --git a/patches/server/0165-Piglin-portal-spawn-modifier.patch b/patches/server/0164-Piglin-portal-spawn-modifier.patch
similarity index 100%
rename from patches/server/0165-Piglin-portal-spawn-modifier.patch
rename to patches/server/0164-Piglin-portal-spawn-modifier.patch
diff --git a/patches/server/0166-Config-to-change-max-number-of-bees.patch b/patches/server/0165-Config-to-change-max-number-of-bees.patch
similarity index 100%
rename from patches/server/0166-Config-to-change-max-number-of-bees.patch
rename to patches/server/0165-Config-to-change-max-number-of-bees.patch
diff --git a/patches/server/0167-Config-for-wither-explosion-radius.patch b/patches/server/0166-Config-for-wither-explosion-radius.patch
similarity index 100%
rename from patches/server/0167-Config-for-wither-explosion-radius.patch
rename to patches/server/0166-Config-for-wither-explosion-radius.patch
diff --git a/patches/server/0168-Gamemode-extra-permissions.patch b/patches/server/0167-Gamemode-extra-permissions.patch
similarity index 100%
rename from patches/server/0168-Gamemode-extra-permissions.patch
rename to patches/server/0167-Gamemode-extra-permissions.patch
diff --git a/patches/server/0169-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0168-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
similarity index 100%
rename from patches/server/0169-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
rename to patches/server/0168-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
diff --git a/patches/server/0170-Configurable-piston-push-limit.patch b/patches/server/0169-Configurable-piston-push-limit.patch
similarity index 100%
rename from patches/server/0170-Configurable-piston-push-limit.patch
rename to patches/server/0169-Configurable-piston-push-limit.patch
diff --git a/patches/server/0171-Configurable-broadcast-settings.patch b/patches/server/0170-Configurable-broadcast-settings.patch
similarity index 97%
rename from patches/server/0171-Configurable-broadcast-settings.patch
rename to patches/server/0170-Configurable-broadcast-settings.patch
index d98ed7dc0..5e76301dc 100644
--- a/patches/server/0171-Configurable-broadcast-settings.patch
+++ b/patches/server/0170-Configurable-broadcast-settings.patch
@@ -17,7 +17,7 @@ index 897e761be8c1f79562f54101173fbba7656a37ec..ce42e91a95ccd42deff65e1942b918e9
                      // Paper end
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 60eca993bfe5a9e1e044f29cb307ba091626a080..d7ea9e8053b96c32ca94f82a89f58223f9983ff1 100644
+index 5d27110793a95118fae2e671e6f9cdede0763216..9eb1c15d831cd5ccdbd1e28bbf2d994bfae4f039 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -922,6 +922,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0172-Configurable-mob-blindness.patch b/patches/server/0171-Configurable-mob-blindness.patch
similarity index 100%
rename from patches/server/0172-Configurable-mob-blindness.patch
rename to patches/server/0171-Configurable-mob-blindness.patch
diff --git a/patches/server/0173-Hide-hidden-players-from-entity-selector.patch b/patches/server/0172-Hide-hidden-players-from-entity-selector.patch
similarity index 100%
rename from patches/server/0173-Hide-hidden-players-from-entity-selector.patch
rename to patches/server/0172-Hide-hidden-players-from-entity-selector.patch
diff --git a/patches/server/0174-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0173-Config-for-health-to-impact-Creeper-explosion-radius.patch
similarity index 96%
rename from patches/server/0174-Config-for-health-to-impact-Creeper-explosion-radius.patch
rename to patches/server/0173-Config-for-health-to-impact-Creeper-explosion-radius.patch
index 463b73be7..34308fa9f 100644
--- a/patches/server/0174-Config-for-health-to-impact-Creeper-explosion-radius.patch
+++ b/patches/server/0173-Config-for-health-to-impact-Creeper-explosion-radius.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config for health to impact Creeper explosion radius
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index bd58b7d364b5e0361e7b8c67d1b26b7f8d3906d3..b19e130b56839c261dd71bbf62b052ede5fb7227 100644
+index 2ffa10ddd1a19aa44c088a41fdfcbd596e493791..663232752b74fea95010510d237b439d217be9ca 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -366,9 +366,10 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0175-Iron-golem-calm-anger-options.patch b/patches/server/0174-Iron-golem-calm-anger-options.patch
similarity index 100%
rename from patches/server/0175-Iron-golem-calm-anger-options.patch
rename to patches/server/0174-Iron-golem-calm-anger-options.patch
diff --git a/patches/server/0176-Breedable-parrots.patch b/patches/server/0175-Breedable-parrots.patch
similarity index 100%
rename from patches/server/0176-Breedable-parrots.patch
rename to patches/server/0175-Breedable-parrots.patch
diff --git a/patches/server/0177-Configurable-powered-rail-boost-modifier.patch b/patches/server/0176-Configurable-powered-rail-boost-modifier.patch
similarity index 100%
rename from patches/server/0177-Configurable-powered-rail-boost-modifier.patch
rename to patches/server/0176-Configurable-powered-rail-boost-modifier.patch
diff --git a/patches/server/0178-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0177-Add-config-change-multiplier-critical-damage-value.patch
similarity index 100%
rename from patches/server/0178-Add-config-change-multiplier-critical-damage-value.patch
rename to patches/server/0177-Add-config-change-multiplier-critical-damage-value.patch
diff --git a/patches/server/0179-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0178-Option-to-disable-dragon-egg-teleporting.patch
similarity index 100%
rename from patches/server/0179-Option-to-disable-dragon-egg-teleporting.patch
rename to patches/server/0178-Option-to-disable-dragon-egg-teleporting.patch
diff --git a/patches/server/0180-Config-for-unverified-username-message.patch b/patches/server/0179-Config-for-unverified-username-message.patch
similarity index 97%
rename from patches/server/0180-Config-for-unverified-username-message.patch
rename to patches/server/0179-Config-for-unverified-username-message.patch
index b67c9f168..dc006da40 100644
--- a/patches/server/0180-Config-for-unverified-username-message.patch
+++ b/patches/server/0179-Config-for-unverified-username-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config for unverified username message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index c36babd85b7d5ba57c08708d0bbf01e16a70a4b2..42042b24c3704d3001ad25fc66676b291273ee52 100644
+index 9a5583696cb847514ada6d6cf05484c1b4f596a5..0ba45c0ea3d842f89a4dd88ee0a80092e0020630 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -405,7 +405,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0181-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0180-Make-anvil-cumulative-cost-configurable.patch
similarity index 100%
rename from patches/server/0181-Make-anvil-cumulative-cost-configurable.patch
rename to patches/server/0180-Make-anvil-cumulative-cost-configurable.patch
diff --git a/patches/server/0182-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0181-ShulkerBox-allow-oversized-stacks.patch
similarity index 100%
rename from patches/server/0182-ShulkerBox-allow-oversized-stacks.patch
rename to patches/server/0181-ShulkerBox-allow-oversized-stacks.patch
diff --git a/patches/server/0183-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0182-Bee-can-work-when-raining-or-at-night.patch
similarity index 100%
rename from patches/server/0183-Bee-can-work-when-raining-or-at-night.patch
rename to patches/server/0182-Bee-can-work-when-raining-or-at-night.patch
diff --git a/patches/server/0184-API-for-any-mob-to-burn-daylight.patch b/patches/server/0183-API-for-any-mob-to-burn-daylight.patch
similarity index 99%
rename from patches/server/0184-API-for-any-mob-to-burn-daylight.patch
rename to patches/server/0183-API-for-any-mob-to-burn-daylight.patch
index 9d61ded1a..d0e262014 100644
--- a/patches/server/0184-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0183-API-for-any-mob-to-burn-daylight.patch
@@ -351,7 +351,7 @@ index f2900d76e9577c83be377500f7d7e7f438a56683..0748babe61be5e5082132af6c4a3bc82
          // Paper end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 3c3c9578f511987f8c237306647d04e8b57099e1..061d24461782e2ab76c3406f77a33f9f508f02cb 100644
+index 240d7cfc0c5f5e3d3c53388f034a1b1faf9a4dfe..be5cadf73ca4e2a2aa490e77ab7747ec8647a2ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -203,6 +203,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0185-Config-MobEffect-by-world.patch b/patches/server/0184-Config-MobEffect-by-world.patch
similarity index 100%
rename from patches/server/0185-Config-MobEffect-by-world.patch
rename to patches/server/0184-Config-MobEffect-by-world.patch
diff --git a/patches/server/0186-Beacon-Activation-Range-Configurable.patch b/patches/server/0185-Beacon-Activation-Range-Configurable.patch
similarity index 100%
rename from patches/server/0186-Beacon-Activation-Range-Configurable.patch
rename to patches/server/0185-Beacon-Activation-Range-Configurable.patch
diff --git a/patches/server/0187-Add-toggle-for-sand-duping-fix.patch b/patches/server/0186-Add-toggle-for-sand-duping-fix.patch
similarity index 100%
rename from patches/server/0187-Add-toggle-for-sand-duping-fix.patch
rename to patches/server/0186-Add-toggle-for-sand-duping-fix.patch
diff --git a/patches/server/0188-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0187-Add-toggle-for-end-portal-safe-teleporting.patch
similarity index 100%
rename from patches/server/0188-Add-toggle-for-end-portal-safe-teleporting.patch
rename to patches/server/0187-Add-toggle-for-end-portal-safe-teleporting.patch
diff --git a/patches/server/0189-Flying-Fall-Damage-API.patch b/patches/server/0188-Flying-Fall-Damage-API.patch
similarity index 100%
rename from patches/server/0189-Flying-Fall-Damage-API.patch
rename to patches/server/0188-Flying-Fall-Damage-API.patch
diff --git a/patches/server/0190-Make-lightning-rod-range-configurable.patch b/patches/server/0189-Make-lightning-rod-range-configurable.patch
similarity index 100%
rename from patches/server/0190-Make-lightning-rod-range-configurable.patch
rename to patches/server/0189-Make-lightning-rod-range-configurable.patch
diff --git a/patches/server/0191-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0190-Burp-after-eating-food-fills-hunger-bar-completely.patch
similarity index 100%
rename from patches/server/0191-Burp-after-eating-food-fills-hunger-bar-completely.patch
rename to patches/server/0190-Burp-after-eating-food-fills-hunger-bar-completely.patch
diff --git a/patches/server/0192-Allow-player-join-full-server-by-permission.patch b/patches/server/0191-Allow-player-join-full-server-by-permission.patch
similarity index 93%
rename from patches/server/0192-Allow-player-join-full-server-by-permission.patch
rename to patches/server/0191-Allow-player-join-full-server-by-permission.patch
index 9af4a08b6..55347ee52 100644
--- a/patches/server/0192-Allow-player-join-full-server-by-permission.patch
+++ b/patches/server/0191-Allow-player-join-full-server-by-permission.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow player join full server by permission
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d1495cb8ce938906d3ca0583700b853957efca0d..34996512dd38bccfa5d8a7cdb6f59ec5c6489919 100644
+index 0e690d78c295ca13262230e105a3a26b89c26496..11711b048755cafcefe0e944b35531da15e1eda0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -777,7 +777,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0193-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0192-Add-permission-bypass-for-portal-waiting.patch
similarity index 100%
rename from patches/server/0193-Add-permission-bypass-for-portal-waiting.patch
rename to patches/server/0192-Add-permission-bypass-for-portal-waiting.patch
diff --git a/patches/server/0194-Shulker-spawn-from-bullet-options.patch b/patches/server/0193-Shulker-spawn-from-bullet-options.patch
similarity index 100%
rename from patches/server/0194-Shulker-spawn-from-bullet-options.patch
rename to patches/server/0193-Shulker-spawn-from-bullet-options.patch
diff --git a/patches/server/0195-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0194-Eating-glow-berries-adds-glow-effect.patch
similarity index 100%
rename from patches/server/0195-Eating-glow-berries-adds-glow-effect.patch
rename to patches/server/0194-Eating-glow-berries-adds-glow-effect.patch
diff --git a/patches/server/0196-Option-to-make-drowned-break-doors.patch b/patches/server/0195-Option-to-make-drowned-break-doors.patch
similarity index 100%
rename from patches/server/0196-Option-to-make-drowned-break-doors.patch
rename to patches/server/0195-Option-to-make-drowned-break-doors.patch
diff --git a/patches/server/0197-Configurable-hunger-starvation-damage.patch b/patches/server/0196-Configurable-hunger-starvation-damage.patch
similarity index 100%
rename from patches/server/0197-Configurable-hunger-starvation-damage.patch
rename to patches/server/0196-Configurable-hunger-starvation-damage.patch
diff --git a/patches/server/0198-Enhance-SysoutCatcher.patch b/patches/server/0197-Enhance-SysoutCatcher.patch
similarity index 100%
rename from patches/server/0198-Enhance-SysoutCatcher.patch
rename to patches/server/0197-Enhance-SysoutCatcher.patch
diff --git a/patches/server/0199-Armor-click-equip-options.patch b/patches/server/0198-Armor-click-equip-options.patch
similarity index 100%
rename from patches/server/0199-Armor-click-equip-options.patch
rename to patches/server/0198-Armor-click-equip-options.patch
diff --git a/patches/server/0200-Add-uptime-command.patch b/patches/server/0199-Add-uptime-command.patch
similarity index 97%
rename from patches/server/0200-Add-uptime-command.patch
rename to patches/server/0199-Add-uptime-command.patch
index 1a9fd6321..c10f9f8b6 100644
--- a/patches/server/0200-Add-uptime-command.patch
+++ b/patches/server/0199-Add-uptime-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add uptime command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 2b3c7f0bf0841a52a540f042156f55e978364d24..076008b0109669671546e1e476b5c812628d81bd 100644
+index e970c11307cd69685878902234271195752f9f51..ca7aa579f6a6c72dfaed04fde84f4dbcc9ca4f34 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -211,6 +211,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index 2b3c7f0bf0841a52a540f042156f55e978364d24..076008b0109669671546e1e476b5c812
          }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9cfeb50509aac1a509b1d26c3a71ebfa5aa7ca01..cfa12e5978a0e8d006918ba71a43cf08a19823ab 100644
+index 91495867871320d3a52d2de3ef1d91d57e369b16..c5b96bfe37ce7dfddc20e092356cf621ce4e513a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -281,6 +281,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0201-Structure-seed-options.patch b/patches/server/0200-Structure-seed-options.patch
similarity index 100%
rename from patches/server/0201-Structure-seed-options.patch
rename to patches/server/0200-Structure-seed-options.patch
diff --git a/patches/server/0202-Tool-actionable-options.patch b/patches/server/0201-Tool-actionable-options.patch
similarity index 100%
rename from patches/server/0202-Tool-actionable-options.patch
rename to patches/server/0201-Tool-actionable-options.patch
diff --git a/patches/server/0203-Store-placer-on-Block-when-placed.patch b/patches/server/0202-Store-placer-on-Block-when-placed.patch
similarity index 100%
rename from patches/server/0203-Store-placer-on-Block-when-placed.patch
rename to patches/server/0202-Store-placer-on-Block-when-placed.patch
diff --git a/patches/server/0204-Summoner-API.patch b/patches/server/0203-Summoner-API.patch
similarity index 100%
rename from patches/server/0204-Summoner-API.patch
rename to patches/server/0203-Summoner-API.patch
diff --git a/patches/server/0205-Customizable-sleeping-actionbar-messages.patch b/patches/server/0204-Customizable-sleeping-actionbar-messages.patch
similarity index 100%
rename from patches/server/0205-Customizable-sleeping-actionbar-messages.patch
rename to patches/server/0204-Customizable-sleeping-actionbar-messages.patch
diff --git a/patches/server/0206-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0205-option-to-disable-shulker-box-items-from-dropping-co.patch
similarity index 100%
rename from patches/server/0206-option-to-disable-shulker-box-items-from-dropping-co.patch
rename to patches/server/0205-option-to-disable-shulker-box-items-from-dropping-co.patch
diff --git a/patches/server/0207-Silk-touchable-budding-amethyst.patch b/patches/server/0206-Silk-touchable-budding-amethyst.patch
similarity index 100%
rename from patches/server/0207-Silk-touchable-budding-amethyst.patch
rename to patches/server/0206-Silk-touchable-budding-amethyst.patch
diff --git a/patches/server/0208-Big-dripleaf-tilt-delay.patch b/patches/server/0207-Big-dripleaf-tilt-delay.patch
similarity index 100%
rename from patches/server/0208-Big-dripleaf-tilt-delay.patch
rename to patches/server/0207-Big-dripleaf-tilt-delay.patch
diff --git a/patches/server/0209-Player-ridable-in-water-option.patch b/patches/server/0208-Player-ridable-in-water-option.patch
similarity index 100%
rename from patches/server/0209-Player-ridable-in-water-option.patch
rename to patches/server/0208-Player-ridable-in-water-option.patch
diff --git a/patches/server/0210-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0209-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
similarity index 100%
rename from patches/server/0210-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
rename to patches/server/0209-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
diff --git a/patches/server/0211-Add-compass-command.patch b/patches/server/0210-Add-compass-command.patch
similarity index 100%
rename from patches/server/0211-Add-compass-command.patch
rename to patches/server/0210-Add-compass-command.patch
diff --git a/patches/server/0212-Config-to-prevent-horses-from-standing-with-riders.patch b/patches/server/0211-Config-to-prevent-horses-from-standing-with-riders.patch
similarity index 100%
rename from patches/server/0212-Config-to-prevent-horses-from-standing-with-riders.patch
rename to patches/server/0211-Config-to-prevent-horses-from-standing-with-riders.patch
diff --git a/patches/server/0213-Toggle-for-kinetic-damage.patch b/patches/server/0212-Toggle-for-kinetic-damage.patch
similarity index 100%
rename from patches/server/0213-Toggle-for-kinetic-damage.patch
rename to patches/server/0212-Toggle-for-kinetic-damage.patch
diff --git a/patches/server/0214-Add-Option-for-disable-observer-clocks.patch b/patches/server/0213-Add-Option-for-disable-observer-clocks.patch
similarity index 100%
rename from patches/server/0214-Add-Option-for-disable-observer-clocks.patch
rename to patches/server/0213-Add-Option-for-disable-observer-clocks.patch
diff --git a/patches/server/0215-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0214-Customizeable-Zombie-Villager-curing-times.patch
similarity index 100%
rename from patches/server/0215-Customizeable-Zombie-Villager-curing-times.patch
rename to patches/server/0214-Customizeable-Zombie-Villager-curing-times.patch
diff --git a/patches/server/0216-Option-for-sponges-to-work-on-lava.patch b/patches/server/0215-Option-for-sponges-to-work-on-lava.patch
similarity index 100%
rename from patches/server/0216-Option-for-sponges-to-work-on-lava.patch
rename to patches/server/0215-Option-for-sponges-to-work-on-lava.patch
diff --git a/patches/server/0217-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0216-Toggle-for-Wither-s-spawn-sound.patch
similarity index 100%
rename from patches/server/0217-Toggle-for-Wither-s-spawn-sound.patch
rename to patches/server/0216-Toggle-for-Wither-s-spawn-sound.patch
diff --git a/patches/server/0218-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0217-Cactus-breaks-from-solid-neighbors-config.patch
similarity index 100%
rename from patches/server/0218-Cactus-breaks-from-solid-neighbors-config.patch
rename to patches/server/0217-Cactus-breaks-from-solid-neighbors-config.patch
diff --git a/patches/server/0219-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0218-Config-to-remove-curse-of-binding-with-weakness.patch
similarity index 100%
rename from patches/server/0219-Config-to-remove-curse-of-binding-with-weakness.patch
rename to patches/server/0218-Config-to-remove-curse-of-binding-with-weakness.patch
diff --git a/patches/server/0220-Conduit-behavior-configuration.patch b/patches/server/0219-Conduit-behavior-configuration.patch
similarity index 100%
rename from patches/server/0220-Conduit-behavior-configuration.patch
rename to patches/server/0219-Conduit-behavior-configuration.patch
diff --git a/patches/server/0221-Cauldron-fill-chances.patch b/patches/server/0220-Cauldron-fill-chances.patch
similarity index 100%
rename from patches/server/0221-Cauldron-fill-chances.patch
rename to patches/server/0220-Cauldron-fill-chances.patch
diff --git a/patches/server/0222-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0221-Config-to-allow-mobs-to-pathfind-over-rails.patch
similarity index 100%
rename from patches/server/0222-Config-to-allow-mobs-to-pathfind-over-rails.patch
rename to patches/server/0221-Config-to-allow-mobs-to-pathfind-over-rails.patch
diff --git a/patches/server/0223-Shulker-change-color-with-dye.patch b/patches/server/0222-Shulker-change-color-with-dye.patch
similarity index 100%
rename from patches/server/0223-Shulker-change-color-with-dye.patch
rename to patches/server/0222-Shulker-change-color-with-dye.patch
diff --git a/patches/server/0224-Extended-OfflinePlayer-API.patch b/patches/server/0223-Extended-OfflinePlayer-API.patch
similarity index 100%
rename from patches/server/0224-Extended-OfflinePlayer-API.patch
rename to patches/server/0223-Extended-OfflinePlayer-API.patch
diff --git a/patches/server/0225-Added-the-ability-to-add-combustible-items.patch b/patches/server/0224-Added-the-ability-to-add-combustible-items.patch
similarity index 100%
rename from patches/server/0225-Added-the-ability-to-add-combustible-items.patch
rename to patches/server/0224-Added-the-ability-to-add-combustible-items.patch
diff --git a/patches/server/0226-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0225-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
similarity index 100%
rename from patches/server/0226-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
rename to patches/server/0225-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
diff --git a/patches/server/0227-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0226-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
similarity index 100%
rename from patches/server/0227-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
rename to patches/server/0226-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
diff --git a/patches/server/0228-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0227-Shift-right-click-to-use-exp-for-mending.patch
similarity index 100%
rename from patches/server/0228-Shift-right-click-to-use-exp-for-mending.patch
rename to patches/server/0227-Shift-right-click-to-use-exp-for-mending.patch
diff --git a/patches/server/0229-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0228-Dolphins-naturally-aggressive-to-players-chance.patch
similarity index 100%
rename from patches/server/0229-Dolphins-naturally-aggressive-to-players-chance.patch
rename to patches/server/0228-Dolphins-naturally-aggressive-to-players-chance.patch
diff --git a/patches/server/0230-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0229-Cows-naturally-aggressive-to-players-chance.patch
similarity index 100%
rename from patches/server/0230-Cows-naturally-aggressive-to-players-chance.patch
rename to patches/server/0229-Cows-naturally-aggressive-to-players-chance.patch
diff --git a/patches/server/0231-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0230-Option-for-beds-to-explode-on-villager-sleep.patch
similarity index 100%
rename from patches/server/0231-Option-for-beds-to-explode-on-villager-sleep.patch
rename to patches/server/0230-Option-for-beds-to-explode-on-villager-sleep.patch
diff --git a/patches/server/0232-Halloween-options-and-optimizations.patch b/patches/server/0231-Halloween-options-and-optimizations.patch
similarity index 100%
rename from patches/server/0232-Halloween-options-and-optimizations.patch
rename to patches/server/0231-Halloween-options-and-optimizations.patch
diff --git a/patches/server/0233-Config-for-grindstones.patch b/patches/server/0232-Config-for-grindstones.patch
similarity index 100%
rename from patches/server/0233-Config-for-grindstones.patch
rename to patches/server/0232-Config-for-grindstones.patch
diff --git a/patches/server/0234-UPnP-Port-Forwarding.patch b/patches/server/0233-UPnP-Port-Forwarding.patch
similarity index 97%
rename from patches/server/0234-UPnP-Port-Forwarding.patch
rename to patches/server/0233-UPnP-Port-Forwarding.patch
index 7b37d2ebd..7b3840945 100644
--- a/patches/server/0234-UPnP-Port-Forwarding.patch
+++ b/patches/server/0233-UPnP-Port-Forwarding.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] UPnP Port Forwarding
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cfa12e5978a0e8d006918ba71a43cf08a19823ab..c487a5ee332c2d75448b34dd7dc89287e53d617c 100644
+index c5b96bfe37ce7dfddc20e092356cf621ce4e513a..39ca0fa3b274845830c15915aa99e32b6a5795a9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -296,6 +296,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0235-Campfire-option-for-lit-when-placed.patch b/patches/server/0234-Campfire-option-for-lit-when-placed.patch
similarity index 100%
rename from patches/server/0235-Campfire-option-for-lit-when-placed.patch
rename to patches/server/0234-Campfire-option-for-lit-when-placed.patch
diff --git a/patches/server/0236-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/server/0235-options-to-extinguish-fire-blocks-with-snowballs.patch
similarity index 100%
rename from patches/server/0236-options-to-extinguish-fire-blocks-with-snowballs.patch
rename to patches/server/0235-options-to-extinguish-fire-blocks-with-snowballs.patch
diff --git a/patches/server/0237-Add-option-to-disable-zombie-villagers-cure.patch b/patches/server/0236-Add-option-to-disable-zombie-villagers-cure.patch
similarity index 100%
rename from patches/server/0237-Add-option-to-disable-zombie-villagers-cure.patch
rename to patches/server/0236-Add-option-to-disable-zombie-villagers-cure.patch
diff --git a/patches/server/0238-Persistent-BlockEntity-Lore-and-DisplayName.patch b/patches/server/0237-Persistent-BlockEntity-Lore-and-DisplayName.patch
similarity index 100%
rename from patches/server/0238-Persistent-BlockEntity-Lore-and-DisplayName.patch
rename to patches/server/0237-Persistent-BlockEntity-Lore-and-DisplayName.patch
diff --git a/patches/server/0239-Signs-allow-color-codes.patch b/patches/server/0238-Signs-allow-color-codes.patch
similarity index 100%
rename from patches/server/0239-Signs-allow-color-codes.patch
rename to patches/server/0238-Signs-allow-color-codes.patch
diff --git a/patches/server/0240-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0239-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
similarity index 100%
rename from patches/server/0240-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
rename to patches/server/0239-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
diff --git a/patches/server/0241-Mobs-always-drop-experience.patch b/patches/server/0240-Mobs-always-drop-experience.patch
similarity index 99%
rename from patches/server/0241-Mobs-always-drop-experience.patch
rename to patches/server/0240-Mobs-always-drop-experience.patch
index daf8f0dda..b389dca70 100644
--- a/patches/server/0241-Mobs-always-drop-experience.patch
+++ b/patches/server/0240-Mobs-always-drop-experience.patch
@@ -597,7 +597,7 @@ index 5347ba12f2a07601c9f044081e5e6ce6472c4a2a..0ac5264a16c9121c0f6233e83c426199
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index b19e130b56839c261dd71bbf62b052ede5fb7227..fb342992e6033bcd001faf7e0bf9c0faa1698034 100644
+index 663232752b74fea95010510d237b439d217be9ca..fe26858b6d2f616fa34f4073ddfc130239aa1370 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -165,6 +165,11 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0242-Potion-NamespacedKey.patch b/patches/server/0241-Potion-NamespacedKey.patch
similarity index 100%
rename from patches/server/0242-Potion-NamespacedKey.patch
rename to patches/server/0241-Potion-NamespacedKey.patch
diff --git a/patches/server/0243-Grindstone-API.patch b/patches/server/0242-Grindstone-API.patch
similarity index 100%
rename from patches/server/0243-Grindstone-API.patch
rename to patches/server/0242-Grindstone-API.patch
diff --git a/patches/server/0244-Option-to-prevent-spiders-from-climbing-world-border.patch b/patches/server/0243-Option-to-prevent-spiders-from-climbing-world-border.patch
similarity index 100%
rename from patches/server/0244-Option-to-prevent-spiders-from-climbing-world-border.patch
rename to patches/server/0243-Option-to-prevent-spiders-from-climbing-world-border.patch
diff --git a/patches/server/0245-Ability-for-hoe-to-replant-crops-and-nether-warts.patch b/patches/server/0244-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
similarity index 100%
rename from patches/server/0245-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
rename to patches/server/0244-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
diff --git a/patches/server/0246-Shearing-jeb-produces-random-color-wool.patch b/patches/server/0245-Shearing-jeb-produces-random-color-wool.patch
similarity index 100%
rename from patches/server/0246-Shearing-jeb-produces-random-color-wool.patch
rename to patches/server/0245-Shearing-jeb-produces-random-color-wool.patch
diff --git a/patches/server/0247-Turtle-eggs-random-tick-crack-chance.patch b/patches/server/0246-Turtle-eggs-random-tick-crack-chance.patch
similarity index 100%
rename from patches/server/0247-Turtle-eggs-random-tick-crack-chance.patch
rename to patches/server/0246-Turtle-eggs-random-tick-crack-chance.patch
diff --git a/patches/server/0248-Mob-head-visibility-percent.patch b/patches/server/0247-Mob-head-visibility-percent.patch
similarity index 100%
rename from patches/server/0248-Mob-head-visibility-percent.patch
rename to patches/server/0247-Mob-head-visibility-percent.patch
diff --git a/patches/server/0249-Configurable-valid-characters-for-usernames.patch b/patches/server/0248-Configurable-valid-characters-for-usernames.patch
similarity index 95%
rename from patches/server/0249-Configurable-valid-characters-for-usernames.patch
rename to patches/server/0248-Configurable-valid-characters-for-usernames.patch
index 69ebc8cfd..0e05e46ea 100644
--- a/patches/server/0249-Configurable-valid-characters-for-usernames.patch
+++ b/patches/server/0248-Configurable-valid-characters-for-usernames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable valid characters for usernames
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 42042b24c3704d3001ad25fc66676b291273ee52..3f6ecc9c6a3bfb477e1c90622cca7b39f5d33005 100644
+index 0ba45c0ea3d842f89a4dd88ee0a80092e0020630..3ce4946bd44467861d065b215a449ee3a0cac77b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -279,6 +279,8 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0250-Shears-can-have-looting-enchantment.patch b/patches/server/0249-Shears-can-have-looting-enchantment.patch
similarity index 100%
rename from patches/server/0250-Shears-can-have-looting-enchantment.patch
rename to patches/server/0249-Shears-can-have-looting-enchantment.patch
diff --git a/patches/server/0251-Stop-bees-from-dying-after-stinging.patch b/patches/server/0250-Stop-bees-from-dying-after-stinging.patch
similarity index 100%
rename from patches/server/0251-Stop-bees-from-dying-after-stinging.patch
rename to patches/server/0250-Stop-bees-from-dying-after-stinging.patch
diff --git a/patches/server/0252-Give-bee-counts-in-beehives-to-Purpur-clients.patch b/patches/server/0251-Give-bee-counts-in-beehives-to-Purpur-clients.patch
similarity index 98%
rename from patches/server/0252-Give-bee-counts-in-beehives-to-Purpur-clients.patch
rename to patches/server/0251-Give-bee-counts-in-beehives-to-Purpur-clients.patch
index 52ecb1e9b..48117942c 100644
--- a/patches/server/0252-Give-bee-counts-in-beehives-to-Purpur-clients.patch
+++ b/patches/server/0251-Give-bee-counts-in-beehives-to-Purpur-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Give bee counts in beehives to Purpur clients
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c487a5ee332c2d75448b34dd7dc89287e53d617c..a5b09ab0171dd100f9bcf81869346b1d11814092 100644
+index 39ca0fa3b274845830c15915aa99e32b6a5795a9..78b72d9f33bccac7b5c61ab2d417b142fc27bde8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1059,6 +1059,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0253-Configurable-farmland-trample-height.patch b/patches/server/0252-Configurable-farmland-trample-height.patch
similarity index 100%
rename from patches/server/0253-Configurable-farmland-trample-height.patch
rename to patches/server/0252-Configurable-farmland-trample-height.patch
diff --git a/patches/server/0254-Configurable-player-pickup-exp-delay.patch b/patches/server/0253-Configurable-player-pickup-exp-delay.patch
similarity index 100%
rename from patches/server/0254-Configurable-player-pickup-exp-delay.patch
rename to patches/server/0253-Configurable-player-pickup-exp-delay.patch
diff --git a/patches/server/0255-Allow-void-trading.patch b/patches/server/0254-Allow-void-trading.patch
similarity index 100%
rename from patches/server/0255-Allow-void-trading.patch
rename to patches/server/0254-Allow-void-trading.patch
diff --git a/patches/server/0256-Dont-eat-blocks-in-non-ticking-chunks.patch b/patches/server/0255-Dont-eat-blocks-in-non-ticking-chunks.patch
similarity index 100%
rename from patches/server/0256-Dont-eat-blocks-in-non-ticking-chunks.patch
rename to patches/server/0255-Dont-eat-blocks-in-non-ticking-chunks.patch
diff --git a/patches/server/0257-Configurable-phantom-size.patch b/patches/server/0256-Configurable-phantom-size.patch
similarity index 100%
rename from patches/server/0257-Configurable-phantom-size.patch
rename to patches/server/0256-Configurable-phantom-size.patch
diff --git a/patches/server/0258-Configurable-food-attributes.patch b/patches/server/0257-Configurable-food-attributes.patch
similarity index 100%
rename from patches/server/0258-Configurable-food-attributes.patch
rename to patches/server/0257-Configurable-food-attributes.patch
diff --git a/patches/server/0259-Max-joins-per-second.patch b/patches/server/0258-Max-joins-per-second.patch
similarity index 100%
rename from patches/server/0259-Max-joins-per-second.patch
rename to patches/server/0258-Max-joins-per-second.patch
diff --git a/patches/server/0260-Configurable-minimum-demand-for-trades.patch b/patches/server/0259-Configurable-minimum-demand-for-trades.patch
similarity index 100%
rename from patches/server/0260-Configurable-minimum-demand-for-trades.patch
rename to patches/server/0259-Configurable-minimum-demand-for-trades.patch
diff --git a/patches/server/0261-Lobotomize-stuck-villagers.patch b/patches/server/0260-Lobotomize-stuck-villagers.patch
similarity index 100%
rename from patches/server/0261-Lobotomize-stuck-villagers.patch
rename to patches/server/0260-Lobotomize-stuck-villagers.patch
diff --git a/patches/server/0262-Option-for-villager-display-trade-item.patch b/patches/server/0261-Option-for-villager-display-trade-item.patch
similarity index 100%
rename from patches/server/0262-Option-for-villager-display-trade-item.patch
rename to patches/server/0261-Option-for-villager-display-trade-item.patch
diff --git a/patches/server/0263-Fill-command-max-area-option.patch b/patches/server/0262-Fill-command-max-area-option.patch
similarity index 100%
rename from patches/server/0263-Fill-command-max-area-option.patch
rename to patches/server/0262-Fill-command-max-area-option.patch
diff --git a/patches/server/0264-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch b/patches/server/0263-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
similarity index 100%
rename from patches/server/0264-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
rename to patches/server/0263-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
diff --git a/patches/server/0265-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0264-Config-for-mob-last-hurt-by-player-time.patch
similarity index 100%
rename from patches/server/0265-Config-for-mob-last-hurt-by-player-time.patch
rename to patches/server/0264-Config-for-mob-last-hurt-by-player-time.patch
diff --git a/patches/server/0266-Anvil-repair-damage-options.patch b/patches/server/0265-Anvil-repair-damage-options.patch
similarity index 100%
rename from patches/server/0266-Anvil-repair-damage-options.patch
rename to patches/server/0265-Anvil-repair-damage-options.patch
diff --git a/patches/server/0267-Fix-legacy-colors-in-console.patch b/patches/server/0266-Fix-legacy-colors-in-console.patch
similarity index 100%
rename from patches/server/0267-Fix-legacy-colors-in-console.patch
rename to patches/server/0266-Fix-legacy-colors-in-console.patch
diff --git a/patches/server/0268-Option-to-disable-turtle-egg-trampling-with-feather-.patch b/patches/server/0267-Option-to-disable-turtle-egg-trampling-with-feather-.patch
similarity index 100%
rename from patches/server/0268-Option-to-disable-turtle-egg-trampling-with-feather-.patch
rename to patches/server/0267-Option-to-disable-turtle-egg-trampling-with-feather-.patch
diff --git a/patches/server/0269-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0268-Add-toggle-for-enchant-level-clamping.patch
similarity index 100%
rename from patches/server/0269-Add-toggle-for-enchant-level-clamping.patch
rename to patches/server/0268-Add-toggle-for-enchant-level-clamping.patch
diff --git a/patches/server/0270-Config-to-prevent-horses-from-standing-when-hurt.patch b/patches/server/0269-Config-to-prevent-horses-from-standing-when-hurt.patch
similarity index 100%
rename from patches/server/0270-Config-to-prevent-horses-from-standing-when-hurt.patch
rename to patches/server/0269-Config-to-prevent-horses-from-standing-when-hurt.patch
diff --git a/patches/server/0271-Drop-incompatible-tests.patch b/patches/server/0270-Drop-incompatible-tests.patch
similarity index 100%
rename from patches/server/0271-Drop-incompatible-tests.patch
rename to patches/server/0270-Drop-incompatible-tests.patch
diff --git a/patches/server/0272-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0271-Implement-configurable-search-radius-for-villagers-t.patch
similarity index 100%
rename from patches/server/0272-Implement-configurable-search-radius-for-villagers-t.patch
rename to patches/server/0271-Implement-configurable-search-radius-for-villagers-t.patch
diff --git a/patches/server/0273-Stonecutter-damage.patch b/patches/server/0272-Stonecutter-damage.patch
similarity index 100%
rename from patches/server/0273-Stonecutter-damage.patch
rename to patches/server/0272-Stonecutter-damage.patch
diff --git a/patches/server/0274-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0273-Configurable-damage-settings-for-magma-blocks.patch
similarity index 100%
rename from patches/server/0274-Configurable-damage-settings-for-magma-blocks.patch
rename to patches/server/0273-Configurable-damage-settings-for-magma-blocks.patch
diff --git a/patches/server/0275-Add-config-for-snow-on-blue-ice.patch b/patches/server/0274-Add-config-for-snow-on-blue-ice.patch
similarity index 100%
rename from patches/server/0275-Add-config-for-snow-on-blue-ice.patch
rename to patches/server/0274-Add-config-for-snow-on-blue-ice.patch
diff --git a/patches/server/0276-Add-log-suppression-for-sent-expired-chat.patch b/patches/server/0275-Add-log-suppression-for-sent-expired-chat.patch
similarity index 100%
rename from patches/server/0276-Add-log-suppression-for-sent-expired-chat.patch
rename to patches/server/0275-Add-log-suppression-for-sent-expired-chat.patch
diff --git a/patches/server/0277-Skeletons-eat-wither-roses.patch b/patches/server/0276-Skeletons-eat-wither-roses.patch
similarity index 100%
rename from patches/server/0277-Skeletons-eat-wither-roses.patch
rename to patches/server/0276-Skeletons-eat-wither-roses.patch
diff --git a/patches/server/0278-Enchantment-Table-Persists-Lapis.patch b/patches/server/0277-Enchantment-Table-Persists-Lapis.patch
similarity index 100%
rename from patches/server/0278-Enchantment-Table-Persists-Lapis.patch
rename to patches/server/0277-Enchantment-Table-Persists-Lapis.patch
diff --git a/patches/server/0279-Spark-Profiler.patch b/patches/server/0278-Spark-Profiler.patch
similarity index 100%
rename from patches/server/0279-Spark-Profiler.patch
rename to patches/server/0278-Spark-Profiler.patch
diff --git a/patches/server/0280-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0279-Option-to-disable-kick-for-out-of-order-chat.patch
similarity index 100%
rename from patches/server/0280-Option-to-disable-kick-for-out-of-order-chat.patch
rename to patches/server/0279-Option-to-disable-kick-for-out-of-order-chat.patch
diff --git a/patches/server/0281-Config-for-sculk-shrieker-can_summon-state.patch b/patches/server/0280-Config-for-sculk-shrieker-can_summon-state.patch
similarity index 100%
rename from patches/server/0281-Config-for-sculk-shrieker-can_summon-state.patch
rename to patches/server/0280-Config-for-sculk-shrieker-can_summon-state.patch
diff --git a/patches/server/0282-Config-to-not-let-coral-die.patch b/patches/server/0281-Config-to-not-let-coral-die.patch
similarity index 100%
rename from patches/server/0282-Config-to-not-let-coral-die.patch
rename to patches/server/0281-Config-to-not-let-coral-die.patch
diff --git a/patches/server/0283-Add-local-difficulty-api.patch b/patches/server/0282-Add-local-difficulty-api.patch
similarity index 100%
rename from patches/server/0283-Add-local-difficulty-api.patch
rename to patches/server/0282-Add-local-difficulty-api.patch
diff --git a/patches/server/0284-Add-toggle-for-RNG-manipulation.patch b/patches/server/0283-Add-toggle-for-RNG-manipulation.patch
similarity index 100%
rename from patches/server/0284-Add-toggle-for-RNG-manipulation.patch
rename to patches/server/0283-Add-toggle-for-RNG-manipulation.patch
diff --git a/patches/server/0285-Send-client-custom-name-of-BE.patch b/patches/server/0284-Send-client-custom-name-of-BE.patch
similarity index 100%
rename from patches/server/0285-Send-client-custom-name-of-BE.patch
rename to patches/server/0284-Send-client-custom-name-of-BE.patch
diff --git a/patches/server/0286-PaperPR-Fix-exact-choice-recipe-book-clicks.patch b/patches/server/0285-PaperPR-Fix-exact-choice-recipe-book-clicks.patch
similarity index 100%
rename from patches/server/0286-PaperPR-Fix-exact-choice-recipe-book-clicks.patch
rename to patches/server/0285-PaperPR-Fix-exact-choice-recipe-book-clicks.patch
diff --git a/patches/server/0287-Allow-custom-ChatDecorators.patch b/patches/server/0286-Allow-custom-ChatDecorators.patch
similarity index 100%
rename from patches/server/0287-Allow-custom-ChatDecorators.patch
rename to patches/server/0286-Allow-custom-ChatDecorators.patch
diff --git a/patches/server/0288-Cache-server-motd.patch b/patches/server/0287-Cache-server-motd.patch
similarity index 95%
rename from patches/server/0288-Cache-server-motd.patch
rename to patches/server/0287-Cache-server-motd.patch
index 44417928d..8a2617fe9 100644
--- a/patches/server/0288-Cache-server-motd.patch
+++ b/patches/server/0287-Cache-server-motd.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Cache server motd
 Paper ported my patch in an odd way. Keeping my patch around to reduce logic on the motd getter
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a5b09ab0171dd100f9bcf81869346b1d11814092..f31602ece11240f3c1991c1d9dc8fde4f48890fe 100644
+index 06a17bcd8ecfba67866548a71b46e7cf66b29527..6f13001b2ffa6a54aa6cc182084159215a67b31d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -234,7 +234,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0289-Remove-Timings.patch b/patches/server/0288-Remove-Timings.patch
similarity index 97%
rename from patches/server/0289-Remove-Timings.patch
rename to patches/server/0288-Remove-Timings.patch
index 992df69a4..7581bdfae 100644
--- a/patches/server/0289-Remove-Timings.patch
+++ b/patches/server/0288-Remove-Timings.patch
@@ -57,6 +57,27 @@ index 0d245ad7d19b11e946e0b5b43bf2181292297210..49f3a4e66ea38e80f809607100350051
              });
  
              return; // the main thread will now complete the data
+diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+index bc72131afa1ae9986ee311a9b371e97c8feb38f8..538bf435a4307a166bf6d926f71f391f620233f0 100644
+--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
++++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+@@ -68,14 +68,14 @@ public class GlobalConfiguration extends ConfigurationPart {
+ 
+         @Override
+         public void postProcess() {
+-            // Pufferfish start
++            /*// Pufferfish start // Purpur
+             if (enabled && !reallyEnabled) {
+                 Bukkit.getLogger().log(Level.WARNING, "[Pufferfish] To improve performance, timings have been disabled by default");
+                 Bukkit.getLogger().log(Level.WARNING, "[Pufferfish] You can still use timings by using /timings on, but they will not start on server startup unless you set timings.really-enabled to true in paper.yml");
+                 Bukkit.getLogger().log(Level.WARNING, "[Pufferfish] If you would like to disable this message, either set timings.really-enabled to true or timings.enabled to false.");
+             }
+             enabled = reallyEnabled;
+-            // Pufferfish end
++            */// Pufferfish end // Purpur
+             MinecraftTimings.processConfig(this);
+         }
+     }
 diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
 index 8bc0cb9ad5bb4e76d962ff54305e2c08e279a17b..e8efbbeece7e866c6c4d7489677d2d9e15fea4d0 100644
 --- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java
diff --git a/patches/server/0290-Remove-Mojang-Profiler.patch b/patches/server/0289-Remove-Mojang-Profiler.patch
similarity index 99%
rename from patches/server/0290-Remove-Mojang-Profiler.patch
rename to patches/server/0289-Remove-Mojang-Profiler.patch
index 775a1f105..2cb4f1727 100644
--- a/patches/server/0290-Remove-Mojang-Profiler.patch
+++ b/patches/server/0289-Remove-Mojang-Profiler.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove Mojang Profiler
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index a1b80de62f07e0b476775289ec46e3f685b41d7f..ffcc53399da282a525785426279c3194cf965c22 100644
+index 5b4a89c696f6457bef24bb8792303dfde7ae510c..b5dea3cea431d8f92628ada67e2980799025fcbe 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -138,7 +138,7 @@ public class Commands {
@@ -39,7 +39,7 @@ index a1b80de62f07e0b476775289ec46e3f685b41d7f..ffcc53399da282a525785426279c3194
  
          return b0;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 96255e81c232f9cbc3268127d4232bb9c2c73292..d678c6e0109dabe93485fb214622a0213c790f26 100644
+index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c1397b9f2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -328,13 +328,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -802,7 +802,7 @@ index ad14dbed67ca622f9c8e05164104fe9a9c5b59d4..c50dc34a731477c76315d8ef6b59b853
  
                  while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ab3744184ed4e761e58ea93099a3d6e9ca68bdde..1013618b91df8b2bdf2aa3f5f9f91f0af5a8a7f0 100644
+index dd4c1c3cd907b943ab1740d0c9de8652807b27b7..fb0980743d765e16e2a1dcf37a00cdb0c68c3350 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1153,7 +1153,7 @@ public class ServerPlayer extends Player {
@@ -835,7 +835,7 @@ index ab3744184ed4e761e58ea93099a3d6e9ca68bdde..1013618b91df8b2bdf2aa3f5f9f91f0a
                  this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
                  playerlist.sendLevelInfo(this, worldserver);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 473bbdf6b98eabe55f02e93bb72e1877fcf236e9..b17b01b4689f87bae9640d41115851cc2e6170a2 100644
+index f0ce2e74a57ffbd9bf1aaf7535250c3862f351eb..702a3de778093c6a8c58c2602753a6a0ee1dfb31 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -419,7 +419,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0291-Add-more-logger-output-for-invalid-movement-kicks.patch b/patches/server/0290-Add-more-logger-output-for-invalid-movement-kicks.patch
similarity index 96%
rename from patches/server/0291-Add-more-logger-output-for-invalid-movement-kicks.patch
rename to patches/server/0290-Add-more-logger-output-for-invalid-movement-kicks.patch
index c846e0015..78ca867e6 100644
--- a/patches/server/0291-Add-more-logger-output-for-invalid-movement-kicks.patch
+++ b/patches/server/0290-Add-more-logger-output-for-invalid-movement-kicks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more logger output for invalid movement kicks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b48fc0c80b3b91dcd16c414e02cc95406262b8e2..d9bc8cfd994835c5f23137552641c488dc5a475d 100644
+index 702a3de778093c6a8c58c2602753a6a0ee1dfb31..e766dbabf6e0868d79f33aef3ee3ac466e40c2a1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -861,6 +861,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0292-Add-Bee-API.patch b/patches/server/0291-Add-Bee-API.patch
similarity index 100%
rename from patches/server/0292-Add-Bee-API.patch
rename to patches/server/0291-Add-Bee-API.patch
diff --git a/patches/server/0293-Debug-Marker-API.patch b/patches/server/0292-Debug-Marker-API.patch
similarity index 100%
rename from patches/server/0293-Debug-Marker-API.patch
rename to patches/server/0292-Debug-Marker-API.patch