diff --git a/patches/server/0217-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/server/0217-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
deleted file mode 100644
index 87306d1d2..000000000
--- a/patches/server/0217-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Hugo Manrique <hugmanrique@gmail.com>
-Date: Mon, 16 Jul 2018 12:42:20 +0200
-Subject: [PATCH] Avoid item merge if stack size above max stack size
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index a0b27bdeabcabd0bd07b1b495105f9b6af998092..ab48f572c778924354f30ff05bb45f3b235817af 100644
---- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -232,6 +232,10 @@ public class ItemEntity extends Entity {
- 
-     private void mergeWithNeighbours() {
-         if (this.isMergable()) {
-+            // Paper start - avoid item merge if stack size above max stack size
-+            ItemStack stack = getItem();
-+            if (stack.getCount() >= stack.getMaxStackSize()) return;
-+            // Paper end
-             // Spigot start
-             double radius = level.spigotConfig.itemMerge;
-             List<ItemEntity> list = this.level.getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(radius, radius - 0.5D, radius), (entityitem) -> {
diff --git a/patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
similarity index 100%
rename from patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
rename to patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
diff --git a/patches/server/0219-add-more-information-to-Entity.toString.patch b/patches/server/0218-add-more-information-to-Entity.toString.patch
similarity index 100%
rename from patches/server/0219-add-more-information-to-Entity.toString.patch
rename to patches/server/0218-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0220-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0219-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from patches/server/0220-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to patches/server/0219-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/patches/server/0221-EnderDragon-Events.patch b/patches/server/0220-EnderDragon-Events.patch
similarity index 100%
rename from patches/server/0221-EnderDragon-Events.patch
rename to patches/server/0220-EnderDragon-Events.patch
diff --git a/patches/server/0222-PlayerElytraBoostEvent.patch b/patches/server/0221-PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/server/0222-PlayerElytraBoostEvent.patch
rename to patches/server/0221-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0223-PlayerLaunchProjectileEvent.patch b/patches/server/0222-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/server/0223-PlayerLaunchProjectileEvent.patch
rename to patches/server/0222-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0224-Improve-BlockPosition-inlining.patch b/patches/server/0223-Improve-BlockPosition-inlining.patch
similarity index 100%
rename from patches/server/0224-Improve-BlockPosition-inlining.patch
rename to patches/server/0223-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 95%
rename from patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index fe0474260..cdc554028 100644
--- a/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -17,7 +17,7 @@ index ed698f3e3f9ed6003fe621c5f6f7e3a151a1a559..9897dbb03c343e1e1842f7ca6bc9b99b
  
          for (int i = 0; i < list.size(); ++i) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ad0f91d57b5cbf0c4439993ad99ec7a484729a2e..ed29841c17a4d29ca05cbd307fa474d2208f5b3f 100644
+index 4022c4d3b2ce935f69460e4de21f1fad7c100b26..056531554bf6e8743111607237d942af13d47848 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -735,6 +735,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0226-Vanished-players-don-t-have-rights.patch b/patches/server/0225-Vanished-players-don-t-have-rights.patch
similarity index 100%
rename from patches/server/0226-Vanished-players-don-t-have-rights.patch
rename to patches/server/0225-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0227-Allow-disabling-armour-stand-ticking.patch b/patches/server/0226-Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from patches/server/0227-Allow-disabling-armour-stand-ticking.patch
rename to patches/server/0226-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/0228-SkeletonHorse-Additions.patch b/patches/server/0227-SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/server/0228-SkeletonHorse-Additions.patch
rename to patches/server/0227-SkeletonHorse-Additions.patch
diff --git a/patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0228-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to patches/server/0228-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0230-Implement-Expanded-ArmorStand-API.patch b/patches/server/0229-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0230-Implement-Expanded-ArmorStand-API.patch
rename to patches/server/0229-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0231-AnvilDamageEvent.patch b/patches/server/0230-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0231-AnvilDamageEvent.patch
rename to patches/server/0230-AnvilDamageEvent.patch
diff --git a/patches/server/0232-Add-hand-to-bucket-events.patch b/patches/server/0231-Add-hand-to-bucket-events.patch
similarity index 99%
rename from patches/server/0232-Add-hand-to-bucket-events.patch
rename to patches/server/0231-Add-hand-to-bucket-events.patch
index 82a19d888..0c3849fc4 100644
--- a/patches/server/0232-Add-hand-to-bucket-events.patch
+++ b/patches/server/0231-Add-hand-to-bucket-events.patch
@@ -86,7 +86,7 @@ index 90c8ef9995e834c245cc33f5e59ffdabd5a0b8cd..7c6c928da4e0f3ac54fa9b9ddce7b0e0
                  int i = blockposition.getX();
                  int j = blockposition.getY();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8620c065e7709bf8a366760073d58f902215d1c0..6f9498a7064c41e61f7e50cbe6b4a8d6384f902c 100644
+index 49ec76720dea8c756817ded7d02bfea02f86d428..2dac07a71474fd9c92955914f121094fcad23212 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -422,6 +422,20 @@ public class CraftEventFactory {
diff --git a/patches/server/0233-Add-TNTPrimeEvent.patch b/patches/server/0232-Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/server/0233-Add-TNTPrimeEvent.patch
rename to patches/server/0232-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 100%
rename from patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0234-MC-135506-Experience-should-save-as-Integers.patch
similarity index 100%
rename from patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
rename to patches/server/0234-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/patches/server/0236-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0235-Remove-unnecessary-itemmeta-handling.patch
similarity index 100%
rename from patches/server/0236-Remove-unnecessary-itemmeta-handling.patch
rename to patches/server/0235-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 100%
rename from patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 98%
rename from patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
index 6809ac092..257a379d7 100644
--- a/patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 94201e91ee67c00fb9d5af0c6db9d96999164c06..d4595c3eadce0b09042043bd9d31aa57285e04ce 100644
+index f532aba1f180f0c86b4360bb85993732207b2345..e3f43c2b6ff47f6a8c158d176dfc2c5a3fa66a62 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1057,6 +1057,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -33,7 +33,7 @@ index b248c0f481436b1b101dc1f75eaaf8023f4ba0ea..02ea5304a3f99d69005ab1a7ea85e6a1
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8ede5166c3764f75c27e170ef40b89a103389073..ac7a1408efe242d34200d3f27333a1df72b5b7dd 100644
+index 07c8c19e5bbd887a74192b94cbd13df50260b69d..c2bda04775fd4406ee44ac99c56e592eca31bc9f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -900,6 +900,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0239-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from patches/server/0239-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0240-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from patches/server/0240-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0242-Optimize-BlockPosition-helper-methods.patch b/patches/server/0241-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/0242-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0241-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
similarity index 100%
rename from patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
rename to patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0244-Slime-Pathfinder-Events.patch b/patches/server/0243-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/0244-Slime-Pathfinder-Events.patch
rename to patches/server/0243-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0245-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0245-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0246-Optimize-CraftBlockData-Creation.patch b/patches/server/0245-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0246-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0245-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0247-Optimize-MappedRegistry.patch b/patches/server/0246-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0247-Optimize-MappedRegistry.patch
rename to patches/server/0246-Optimize-MappedRegistry.patch
diff --git a/patches/server/0248-Add-PhantomPreSpawnEvent.patch b/patches/server/0247-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/server/0248-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0247-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0249-Add-More-Creeper-API.patch b/patches/server/0248-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/server/0249-Add-More-Creeper-API.patch
rename to patches/server/0248-Add-More-Creeper-API.patch
diff --git a/patches/server/0250-Inventory-removeItemAnySlot.patch b/patches/server/0249-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0250-Inventory-removeItemAnySlot.patch
rename to patches/server/0249-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from patches/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0252-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0251-Asynchronous-chunk-IO-and-loading.patch
similarity index 100%
rename from patches/server/0252-Asynchronous-chunk-IO-and-loading.patch
rename to patches/server/0251-Asynchronous-chunk-IO-and-loading.patch
diff --git a/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0252-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0252-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0253-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0253-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0255-Improve-death-events.patch b/patches/server/0254-Improve-death-events.patch
similarity index 99%
rename from patches/server/0255-Improve-death-events.patch
rename to patches/server/0254-Improve-death-events.patch
index b25cac063..ae4a10cdc 100644
--- a/patches/server/0255-Improve-death-events.patch
+++ b/patches/server/0254-Improve-death-events.patch
@@ -310,7 +310,7 @@ index f94a74728bd7c02a7f8245c92e7916f0b669ee0d..cd54fa8f7bbcb6036e90f4ef7cdc01d7
          this.gameEvent(GameEvent.ENTITY_DIE);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7839f3c136cc7e9bdda2f121001acbd6ed2fd6b3..c39e13bd897d1178900558d510de7367bd0bb3a2 100644
+index 1a10eec46b9b0c3fb94b72e022e75ed89434c189..14ea624eeb87451578138d1eedb4268a2dee7e30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2055,7 +2055,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -330,7 +330,7 @@ index 7839f3c136cc7e9bdda2f121001acbd6ed2fd6b3..c39e13bd897d1178900558d510de7367
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6f9498a7064c41e61f7e50cbe6b4a8d6384f902c..f50e8182f0340119cd06f0b7c96f95727903826e 100644
+index 2dac07a71474fd9c92955914f121094fcad23212..4fc682e1b7de1fe68aac90134c2bb313b5f6842a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -815,9 +815,16 @@ public class CraftEventFactory {
diff --git a/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0255-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0255-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0257-Mob-Pathfinding-API.patch b/patches/server/0256-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0257-Mob-Pathfinding-API.patch
rename to patches/server/0256-Mob-Pathfinding-API.patch
diff --git a/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0257-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to patches/server/0257-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0258-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0258-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0259-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to patches/server/0259-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0260-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0260-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0261-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0261-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0262-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to patches/server/0262-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0264-Honor-EntityAgeable.ageLock.patch b/patches/server/0263-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0264-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0263-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0265-Configurable-connection-throttle-kick-message.patch b/patches/server/0264-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from patches/server/0265-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0264-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0266-Hook-into-CB-plugin-rewrites.patch b/patches/server/0265-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/0266-Hook-into-CB-plugin-rewrites.patch
rename to patches/server/0265-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0267-PreSpawnerSpawnEvent.patch b/patches/server/0266-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/server/0267-PreSpawnerSpawnEvent.patch
rename to patches/server/0266-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0268-Add-LivingEntity-getTargetEntity.patch b/patches/server/0267-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from patches/server/0268-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0267-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0269-Add-sun-related-API.patch b/patches/server/0268-Add-sun-related-API.patch
similarity index 100%
rename from patches/server/0269-Add-sun-related-API.patch
rename to patches/server/0268-Add-sun-related-API.patch
diff --git a/patches/server/0270-Turtle-API.patch b/patches/server/0269-Turtle-API.patch
similarity index 100%
rename from patches/server/0270-Turtle-API.patch
rename to patches/server/0269-Turtle-API.patch
diff --git a/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0270-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0270-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0271-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to patches/server/0271-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0272-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0272-Add-Velocity-IP-Forwarding-Support.patch
index e0567f56e..65acc2133 100644
--- a/patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0272-Add-Velocity-IP-Forwarding-Support.patch
@@ -167,7 +167,7 @@ index 1b075033f0640433341957f6e26ebe25f18928ee..b070624c7ee85b6692f1f44ded6c7813
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ac7a1408efe242d34200d3f27333a1df72b5b7dd..9a9b6ceab49e78a6b5523825e571186f6f610212 100644
+index c2bda04775fd4406ee44ac99c56e592eca31bc9f..6a2e65401130ca885864e9952f594237d089769d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -755,7 +755,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0274-Add-more-Witch-API.patch b/patches/server/0273-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0274-Add-more-Witch-API.patch
rename to patches/server/0273-Add-more-Witch-API.patch
diff --git a/patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 100%
rename from patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0277-Reset-players-airTicks-on-respawn.patch b/patches/server/0276-Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from patches/server/0277-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0276-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 98%
rename from patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index d1c15a336..1e32251a4 100644
--- a/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -58,7 +58,7 @@ index d7e22ddf89619b58516ccef1d75a4c33df61b73c..70b8b86ed827217e536e35a690160adf
          return executorService;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ae210087f3f0af1f98064b39e817d4f8584a1b7c..f8b2bd7937aab3d70492a61918f7564b56639a3e 100644
+index 7bec6d7b376e382c6266456314eda3ea1cc885ec..3bd5f3249290a3e844b7e88625c2585df398af71 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -303,6 +303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0280-Optimize-World-Time-Updates.patch b/patches/server/0279-Optimize-World-Time-Updates.patch
similarity index 96%
rename from patches/server/0280-Optimize-World-Time-Updates.patch
rename to patches/server/0279-Optimize-World-Time-Updates.patch
index 80f410677..fa4a7cc1d 100644
--- a/patches/server/0280-Optimize-World-Time-Updates.patch
+++ b/patches/server/0279-Optimize-World-Time-Updates.patch
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f8b2bd7937aab3d70492a61918f7564b56639a3e..24ac6bdf8af8ef62e700ab416f649fe03d07f335 100644
+index 3bd5f3249290a3e844b7e88625c2585df398af71..c5cb46beeea6cc5c230af390de69c3213c871ef9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1377,12 +1377,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0281-Restore-custom-InventoryHolder-support.patch b/patches/server/0280-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0281-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0280-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0282-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from patches/server/0282-Use-Vanilla-Minecart-Speeds.patch
rename to patches/server/0281-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0283-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0283-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0282-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0285-Make-the-default-permission-message-configurable.patch b/patches/server/0284-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from patches/server/0285-Make-the-default-permission-message-configurable.patch
rename to patches/server/0284-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch
rename to patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0287-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
similarity index 98%
rename from patches/server/0287-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
index 63525f670..d1eec9fe1 100644
--- a/patches/server/0287-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
@@ -101,7 +101,7 @@ index 0e076173033278587df2b5dfbd01cc9005651eb5..dbd8b9b09b82c1b75e8be9dc7416d9f0
      public void write(FriendlyByteBuf buf) {
          buf.writeByte(this.containerId);
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
-index 56cc2169077fed1fe820d08dc14b3add63289add..a7e49476b3e0e46f97cb2cb57377f7ffe5146501 100644
+index cc2f53fba1e5f6b6d4d31081ddaca1ace70abf99..fef3507dbaeb963ba4132ab7beb26d22ec39d425 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 @@ -50,7 +50,7 @@ public class ClientboundLevelChunkPacketData {
diff --git a/patches/server/0288-force-entity-dismount-during-teleportation.patch b/patches/server/0287-force-entity-dismount-during-teleportation.patch
similarity index 100%
rename from patches/server/0288-force-entity-dismount-during-teleportation.patch
rename to patches/server/0287-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0289-Add-more-Zombie-API.patch b/patches/server/0288-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0289-Add-more-Zombie-API.patch
rename to patches/server/0288-Add-more-Zombie-API.patch
diff --git a/patches/server/0290-Book-Size-Limits.patch b/patches/server/0289-Book-Size-Limits.patch
similarity index 100%
rename from patches/server/0290-Book-Size-Limits.patch
rename to patches/server/0289-Book-Size-Limits.patch
diff --git a/patches/server/0291-Add-PlayerConnectionCloseEvent.patch b/patches/server/0290-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/server/0291-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0290-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0292-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0292-Prevent-Enderman-from-loading-chunks.patch
rename to patches/server/0291-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch
rename to patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0296-BlockDestroyEvent.patch b/patches/server/0295-BlockDestroyEvent.patch
similarity index 96%
rename from patches/server/0296-BlockDestroyEvent.patch
rename to patches/server/0295-BlockDestroyEvent.patch
index 677462113..38b61505f 100644
--- a/patches/server/0296-BlockDestroyEvent.patch
+++ b/patches/server/0295-BlockDestroyEvent.patch
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 52b954528037e2f43d7cbcf2bcf8198b0c835109..d412429adffa5cfc68ad9c8937fdceee51660328 100644
+index 2225921e988cdcaa4fb906b281c237972c6e7c1b..bb274ffc0f7bfd09bfcdc9bec43122cecab052e6 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -28,6 +28,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0297-Async-command-map-building.patch b/patches/server/0296-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0297-Async-command-map-building.patch
rename to patches/server/0296-Async-command-map-building.patch
diff --git a/patches/server/0298-Implement-Brigadier-Mojang-API.patch b/patches/server/0297-Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from patches/server/0298-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0297-Implement-Brigadier-Mojang-API.patch
diff --git a/patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0300-Limit-Client-Sign-length-more.patch b/patches/server/0299-Limit-Client-Sign-length-more.patch
similarity index 100%
rename from patches/server/0300-Limit-Client-Sign-length-more.patch
rename to patches/server/0299-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 97%
rename from patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
index ff4ce1a05..bcaddcfed 100644
--- a/patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch
+++ b/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
@@ -9,7 +9,7 @@ creating too large of a packet to sed.
 Co authored by Spottedleaf
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
-index a7e49476b3e0e46f97cb2cb57377f7ffe5146501..7cf356a700e47686e093e2f2f880af919dc0414a 100644
+index fef3507dbaeb963ba4132ab7beb26d22ec39d425..568ac283baf40e2a89f5b002ffd899eba8008ef2 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 @@ -24,6 +24,14 @@ public class ClientboundLevelChunkPacketData {
diff --git a/patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 100%
rename from patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0306-Entity-getEntitySpawnReason.patch b/patches/server/0305-Entity-getEntitySpawnReason.patch
similarity index 100%
rename from patches/server/0306-Entity-getEntitySpawnReason.patch
rename to patches/server/0305-Entity-getEntitySpawnReason.patch
diff --git a/patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 96%
rename from patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch
rename to patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch
index cc7562bc1..d6bdbb059 100644
--- a/patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update entity Metadata for all tracked players
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 232341fa41b1962d329cc17f3146e41c51d22164..2c43304fd7a189f399f0e7757dbd593f3f462c37 100644
+index d6f34adbdf45bbef4a39e629dd7cb6d7fcb5db0f..7881176a900daa3306c691454f688c1f79b73475 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -371,6 +371,12 @@ public class ServerEntity {
diff --git a/patches/server/0308-Fire-event-on-GS4-query.patch b/patches/server/0307-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0308-Fire-event-on-GS4-query.patch
rename to patches/server/0307-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0309-Implement-PlayerPostRespawnEvent.patch b/patches/server/0308-Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/server/0309-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0308-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 94%
rename from patches/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index c64b131e4..beb023479 100644
--- a/patches/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
 vanilla checks for == 0
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index ab48f572c778924354f30ff05bb45f3b235817af..75575f73ab0f4b7fad92843a1d11bae059b50366 100644
+index a0b27bdeabcabd0bd07b1b495105f9b6af998092..23506fd3a98c240606a00e29624012ae3bbab21a 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -116,6 +116,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0311-Server-Tick-Events.patch b/patches/server/0310-Server-Tick-Events.patch
similarity index 93%
rename from patches/server/0311-Server-Tick-Events.patch
rename to patches/server/0310-Server-Tick-Events.patch
index e0eecb942..ed3ae91cc 100644
--- a/patches/server/0311-Server-Tick-Events.patch
+++ b/patches/server/0310-Server-Tick-Events.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 24ac6bdf8af8ef62e700ab416f649fe03d07f335..3d59157b1b5a7bfcfd53142f64f2e6b0093637ff 100644
+index c5cb46beeea6cc5c230af390de69c3213c871ef9..7d1ca1dbd0c1f882b4c59fb6c56e9ba86d81ae42 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1306,6 +1306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0312-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/server/0312-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0313-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch
similarity index 94%
rename from patches/server/0313-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch
index d36b3129f..bddfd4958 100644
--- a/patches/server/0313-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch
@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d412429adffa5cfc68ad9c8937fdceee51660328..c30b310f949400f1eb2329f5f1c726635d9efe4d 100644
+index bb274ffc0f7bfd09bfcdc9bec43122cecab052e6..e6bfc9cdf116b2233a638eec369a80eb8536aa18 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -839,9 +839,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0314-Add-Heightmap-API.patch b/patches/server/0313-Add-Heightmap-API.patch
similarity index 100%
rename from patches/server/0314-Add-Heightmap-API.patch
rename to patches/server/0313-Add-Heightmap-API.patch
diff --git a/patches/server/0315-Mob-Spawner-API-Enhancements.patch b/patches/server/0314-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/0315-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0314-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from patches/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 91%
rename from patches/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to patches/server/0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index a13cd7724..9781685c5 100644
--- a/patches/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/patches/server/0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled
 synchronously when the server gets shut down.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3d59157b1b5a7bfcfd53142f64f2e6b0093637ff..8eeb1b1f2b34a231931b4dcadd7379a7dd79fe44 100644
+index 7d1ca1dbd0c1f882b4c59fb6c56e9ba86d81ae42..97e964030a5cc449543252933f8a7b4800833e69 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2299,7 +2299,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -29,7 +29,7 @@ index 3d59157b1b5a7bfcfd53142f64f2e6b0093637ff..8eeb1b1f2b34a231931b4dcadd7379a7
  
      public boolean isDebugging() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fe5a676abb5c47045f6ca1a6dde78d9859b43abe..403f4166b9e27a9037920195996e7f13c2fb31a2 100644
+index 62fb88baefcf22a49474ea8362db8f99b7318687..a18523d5a9377d11f9cb9a794b8c1ca55ded856a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2049,7 +2049,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0319-Implement-CraftBlockSoundGroup.patch b/patches/server/0318-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0319-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0318-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 100%
rename from patches/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/patches/server/0321-ChunkMapDistance-CME.patch b/patches/server/0320-ChunkMapDistance-CME.patch
similarity index 100%
rename from patches/server/0321-ChunkMapDistance-CME.patch
rename to patches/server/0320-ChunkMapDistance-CME.patch
diff --git a/patches/server/0322-Chunk-debug-command.patch b/patches/server/0321-Chunk-debug-command.patch
similarity index 99%
rename from patches/server/0322-Chunk-debug-command.patch
rename to patches/server/0321-Chunk-debug-command.patch
index 3fc395023..f3e6e0e89 100644
--- a/patches/server/0322-Chunk-debug-command.patch
+++ b/patches/server/0321-Chunk-debug-command.patch
@@ -32,7 +32,7 @@ https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528273&page=com.atlass
 https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528577&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-528577
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index bb8f2a0c9fc1fd9bc50dc82934407e12bbd98276..a110be5e3f3f168a6557cd935de20aeadac5b942 100644
+index 13a5062e539f6f43e6fe582318c36302bd6520ee..527b37e2740d6ca0d8d7695f069111d156c74b66 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -9,11 +9,13 @@ import com.google.common.collect.Maps;
diff --git a/patches/server/0323-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0322-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0323-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0322-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0324-Expose-the-internal-current-tick.patch b/patches/server/0323-Expose-the-internal-current-tick.patch
similarity index 90%
rename from patches/server/0324-Expose-the-internal-current-tick.patch
rename to patches/server/0323-Expose-the-internal-current-tick.patch
index f0b9f6198..9afb503f0 100644
--- a/patches/server/0324-Expose-the-internal-current-tick.patch
+++ b/patches/server/0323-Expose-the-internal-current-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b554f7f3ae57a2cca69a10ec3e8314180cf73d32..45d923dafdc7dad8b35b8bfd97ce7934abf7efde 100644
+index a18523d5a9377d11f9cb9a794b8c1ca55ded856a..66bd0ff02c6085d41251808140aceefa02782b1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2627,5 +2627,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0325-Fix-World-isChunkGenerated-calls.patch b/patches/server/0324-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from patches/server/0325-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0324-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0326-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0325-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0326-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0325-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0327-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0326-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0327-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0326-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0328-Configurable-projectile-relative-velocity.patch b/patches/server/0327-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0328-Configurable-projectile-relative-velocity.patch
rename to patches/server/0327-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0329-offset-item-frame-ticking.patch b/patches/server/0328-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0329-offset-item-frame-ticking.patch
rename to patches/server/0328-offset-item-frame-ticking.patch
diff --git a/patches/server/0330-Fix-MC-158900.patch b/patches/server/0329-Fix-MC-158900.patch
similarity index 100%
rename from patches/server/0330-Fix-MC-158900.patch
rename to patches/server/0329-Fix-MC-158900.patch
diff --git a/patches/server/0331-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0330-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from patches/server/0331-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0330-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0332-Dont-send-unnecessary-sign-update.patch b/patches/server/0331-Dont-send-unnecessary-sign-update.patch
similarity index 100%
rename from patches/server/0332-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0331-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0333-Add-option-to-disable-pillager-patrols.patch b/patches/server/0332-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0333-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0332-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0333-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 100%
rename from patches/server/0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to patches/server/0333-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
diff --git a/patches/server/0335-Flat-bedrock-generator-settings.patch b/patches/server/0334-Flat-bedrock-generator-settings.patch
similarity index 99%
rename from patches/server/0335-Flat-bedrock-generator-settings.patch
rename to patches/server/0334-Flat-bedrock-generator-settings.patch
index 566ecb8d4..2b9f7e9a1 100644
--- a/patches/server/0335-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0334-Flat-bedrock-generator-settings.patch
@@ -100,7 +100,7 @@ index 06e1774dfbb667aca69bc30c9675ed472cb5728c..2f9ba60c0196c3722fbf5a44fbbcf22a
  
      public static SurfaceRules.RuleSource end() {
 diff --git a/src/main/java/net/minecraft/server/Bootstrap.java b/src/main/java/net/minecraft/server/Bootstrap.java
-index 813bf8974d0c565f8f4ba255902276156288c0f1..9525a4adddb5e3c00f1470fc2eeca16b43233428 100644
+index c5822637e48fad4ca4e8cf210431b5eafbf5abb1..0ece775ca7e63184f79fcdd1aa7ed5c16fc9bc9e 100644
 --- a/src/main/java/net/minecraft/server/Bootstrap.java
 +++ b/src/main/java/net/minecraft/server/Bootstrap.java
 @@ -75,6 +75,7 @@ public class Bootstrap {
diff --git a/patches/server/0336-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0335-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0336-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0335-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0337-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0336-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0337-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0336-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0338-Duplicate-UUID-Resolve-Option.patch b/patches/server/0337-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/0338-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0337-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0339-Optimize-Hoppers.patch b/patches/server/0338-Optimize-Hoppers.patch
similarity index 99%
rename from patches/server/0339-Optimize-Hoppers.patch
rename to patches/server/0338-Optimize-Hoppers.patch
index 4a7cb4565..0de2f34d3 100644
--- a/patches/server/0339-Optimize-Hoppers.patch
+++ b/patches/server/0338-Optimize-Hoppers.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] Optimize Hoppers
 * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6ceed3a97a7fc351052b2020572d65801542f593..6f7ff5486d7f7661c352a54b38598b15adebe26a 100644
+index feba451e86ef49e5edcc5dc60fae18537a95ee71..3e0e9ae6eb0cdf3e2c53c894cc65277bc4e73b67 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1409,6 +1409,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0340-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0339-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/server/0340-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0339-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0341-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0340-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0341-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0340-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0342-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0341-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0342-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0341-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0343-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0342-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0343-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0342-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0344-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0343-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 100%
rename from patches/server/0344-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to patches/server/0343-Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/patches/server/0345-Fix-items-not-falling-correctly.patch b/patches/server/0344-Fix-items-not-falling-correctly.patch
similarity index 96%
rename from patches/server/0345-Fix-items-not-falling-correctly.patch
rename to patches/server/0344-Fix-items-not-falling-correctly.patch
index 27a2f1d45..72f9d6011 100644
--- a/patches/server/0345-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0344-Fix-items-not-falling-correctly.patch
@@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking Spigot's entity
 activation range check from an item's move method.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 75575f73ab0f4b7fad92843a1d11bae059b50366..85fc33183ff01611bfa90ddd33a9c885d1dd7172 100644
+index 23506fd3a98c240606a00e29624012ae3bbab21a..a0de239a8497c906c2329131b14587637b0fdfcf 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -144,7 +144,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0346-Lag-compensate-eating.patch b/patches/server/0345-Lag-compensate-eating.patch
similarity index 100%
rename from patches/server/0346-Lag-compensate-eating.patch
rename to patches/server/0345-Lag-compensate-eating.patch
diff --git a/patches/server/0347-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0346-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0347-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0346-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0348-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0347-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0348-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0347-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0349-Add-effect-to-block-break-naturally.patch b/patches/server/0348-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from patches/server/0349-Add-effect-to-block-break-naturally.patch
rename to patches/server/0348-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0350-Entity-Activation-Range-2.0.patch b/patches/server/0349-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from patches/server/0350-Entity-Activation-Range-2.0.patch
rename to patches/server/0349-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0351-Increase-Light-Queue-Size.patch b/patches/server/0350-Increase-Light-Queue-Size.patch
similarity index 93%
rename from patches/server/0351-Increase-Light-Queue-Size.patch
rename to patches/server/0350-Increase-Light-Queue-Size.patch
index 46095208e..c12922b67 100644
--- a/patches/server/0351-Increase-Light-Queue-Size.patch
+++ b/patches/server/0350-Increase-Light-Queue-Size.patch
@@ -14,7 +14,7 @@ light engine on shutdown...
 The queue size only puts a cap on max loss, doesn't solve that problem.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6f7ff5486d7f7661c352a54b38598b15adebe26a..bf97a9be49a8a187004ceb302db59c31f12e3e1b 100644
+index 3e0e9ae6eb0cdf3e2c53c894cc65277bc4e73b67..8de56cabd8fdc68e136d41c4d172f3574e21e57a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -777,7 +777,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0352-Fix-Light-Command.patch b/patches/server/0351-Fix-Light-Command.patch
similarity index 100%
rename from patches/server/0352-Fix-Light-Command.patch
rename to patches/server/0351-Fix-Light-Command.patch
diff --git a/patches/server/0353-Anti-Xray.patch b/patches/server/0352-Anti-Xray.patch
similarity index 100%
rename from patches/server/0353-Anti-Xray.patch
rename to patches/server/0352-Anti-Xray.patch
diff --git a/patches/server/0354-Implement-alternative-item-despawn-rate.patch b/patches/server/0353-Implement-alternative-item-despawn-rate.patch
similarity index 92%
rename from patches/server/0354-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0353-Implement-alternative-item-despawn-rate.patch
index d1e6ea3d3..f1d44765b 100644
--- a/patches/server/0354-Implement-alternative-item-despawn-rate.patch
+++ b/patches/server/0353-Implement-alternative-item-despawn-rate.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement alternative item-despawn-rate
 Co-authored-by: Noah van der Aa <ndvdaa@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 85fc33183ff01611bfa90ddd33a9c885d1dd7172..22437b835c309956f263278db37737251e1503d5 100644
+index a0de239a8497c906c2329131b14587637b0fdfcf..b491186d66609046016370e56b96e2c09e7d3a32 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -54,6 +54,7 @@ public class ItemEntity extends Entity {
@@ -35,7 +35,7 @@ index 85fc33183ff01611bfa90ddd33a9c885d1dd7172..22437b835c309956f263278db3773725
              // CraftBukkit start - fire ItemDespawnEvent
              if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
                  this.age = 0;
-@@ -263,7 +264,7 @@ public class ItemEntity extends Entity {
+@@ -259,7 +260,7 @@ public class ItemEntity extends Entity {
      private boolean isMergable() {
          ItemStack itemstack = this.getItem();
  
@@ -44,7 +44,7 @@ index 85fc33183ff01611bfa90ddd33a9c885d1dd7172..22437b835c309956f263278db3773725
      }
  
      private void tryToMerge(ItemEntity other) {
-@@ -507,6 +508,7 @@ public class ItemEntity extends Entity {
+@@ -503,6 +504,7 @@ public class ItemEntity extends Entity {
          com.google.common.base.Preconditions.checkArgument(!stack.isEmpty(), "Cannot drop air"); // CraftBukkit
          this.getEntityData().set(ItemEntity.DATA_ITEM, stack);
          this.getEntityData().markDirty(ItemEntity.DATA_ITEM); // CraftBukkit - SPIGOT-4591, must mark dirty
@@ -52,7 +52,7 @@ index 85fc33183ff01611bfa90ddd33a9c885d1dd7172..22437b835c309956f263278db3773725
      }
  
      @Override
-@@ -570,7 +572,7 @@ public class ItemEntity extends Entity {
+@@ -566,7 +568,7 @@ public class ItemEntity extends Entity {
  
      public void makeFakeItem() {
          this.setNeverPickUp();
diff --git a/patches/server/0355-Tracking-Range-Improvements.patch b/patches/server/0354-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/0355-Tracking-Range-Improvements.patch
rename to patches/server/0354-Tracking-Range-Improvements.patch
diff --git a/patches/server/0356-Fix-items-vanishing-through-end-portal.patch b/patches/server/0355-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from patches/server/0356-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0355-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0357-implement-optional-per-player-mob-spawns.patch b/patches/server/0356-implement-optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/server/0357-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0356-implement-optional-per-player-mob-spawns.patch
diff --git a/patches/server/0358-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0357-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 98%
rename from patches/server/0358-Avoid-hopper-searches-if-there-are-no-items.patch
rename to patches/server/0357-Avoid-hopper-searches-if-there-are-no-items.patch
index 891b4e382..f507697c4 100644
--- a/patches/server/0358-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/patches/server/0357-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 0dd5b81da733aa585a78043cea7b4533e4abff72..672e8eff9b9b635106deb32952b6d2dc4323a564 100644
+index c57f400bf1fcfa1a24259ced1821aa43c428d90b..e4dbc1118d6bf3c1958f893de5dbd975af0ce5bc 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -966,7 +966,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0359-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0358-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0359-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0358-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0360-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0359-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0360-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0359-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0361-Add-debug-for-sync-chunk-loads.patch b/patches/server/0360-Add-debug-for-sync-chunk-loads.patch
similarity index 100%
rename from patches/server/0361-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0360-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0362-Remove-garbage-Java-version-check.patch b/patches/server/0361-Remove-garbage-Java-version-check.patch
similarity index 100%
rename from patches/server/0362-Remove-garbage-Java-version-check.patch
rename to patches/server/0361-Remove-garbage-Java-version-check.patch
diff --git a/patches/server/0363-Add-ThrownEggHatchEvent.patch b/patches/server/0362-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0363-Add-ThrownEggHatchEvent.patch
rename to patches/server/0362-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0364-Entity-Jump-API.patch b/patches/server/0363-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0364-Entity-Jump-API.patch
rename to patches/server/0363-Entity-Jump-API.patch
diff --git a/patches/server/0365-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0364-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from patches/server/0365-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0364-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0366-Make-the-GUI-graph-fancier.patch b/patches/server/0365-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0366-Make-the-GUI-graph-fancier.patch
rename to patches/server/0365-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0367-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0366-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 93%
rename from patches/server/0367-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0366-add-hand-to-BlockMultiPlaceEvent.patch
index 6448fbc1d..ae52e5c02 100644
--- a/patches/server/0367-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0366-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f50e8182f0340119cd06f0b7c96f95727903826e..27733f7737945b400d31b432178d792d0b79977d 100644
+index 4fc682e1b7de1fe68aac90134c2bb313b5f6842a..5e1f13641140dca8982af8fd876230f7700c54a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -345,13 +345,18 @@ public class CraftEventFactory {
diff --git a/patches/server/0368-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0367-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0368-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0367-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0369-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0368-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0369-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0368-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0370-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0369-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0370-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0369-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0371-Optimise-Chunk-getFluid.patch b/patches/server/0370-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0371-Optimise-Chunk-getFluid.patch
rename to patches/server/0370-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0372-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0371-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0372-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0371-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0373-Add-tick-times-API-and-mspt-command.patch b/patches/server/0372-Add-tick-times-API-and-mspt-command.patch
similarity index 98%
rename from patches/server/0373-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0372-Add-tick-times-API-and-mspt-command.patch
index e313eb0e2..58bb1619c 100644
--- a/patches/server/0373-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0372-Add-tick-times-API-and-mspt-command.patch
@@ -189,7 +189,7 @@ index 8de56cabd8fdc68e136d41c4d172f3574e21e57a..f69ed252f55623ee5cba6ac9d28096c2
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2dfcb0fcae636043fa3aeeb20aaa0091a73b578c..2f74bdd0ce45486b19314cf17aa312b56fe7c2b7 100644
+index 0c2658c2cd411b6e5e5dcb9a190e7b223eeb0ffc..452f7de1b7c1e2b03c311a1a5f63a6d925b7543f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2449,6 +2449,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0374-Expose-MinecraftServer-isRunning.patch b/patches/server/0373-Expose-MinecraftServer-isRunning.patch
similarity index 90%
rename from patches/server/0374-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0373-Expose-MinecraftServer-isRunning.patch
index 0ac307052..0f63798c5 100644
--- a/patches/server/0374-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0373-Expose-MinecraftServer-isRunning.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2f74bdd0ce45486b19314cf17aa312b56fe7c2b7..f83d09866176f6d8fd9549f82cf743312b3df000 100644
+index 452f7de1b7c1e2b03c311a1a5f63a6d925b7543f..943060b67d962a53bba8c2caa39de435060e036d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2642,5 +2642,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0375-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0374-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0375-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0374-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0376-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0375-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/0376-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0375-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0377-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0376-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0377-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0376-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0378-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0377-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0378-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0377-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0379-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0378-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from patches/server/0379-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0378-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0380-Don-t-tick-dead-players.patch b/patches/server/0379-Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/0380-Don-t-tick-dead-players.patch
rename to patches/server/0379-Don-t-tick-dead-players.patch
diff --git a/patches/server/0381-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0380-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0381-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0380-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0382-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0381-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/0382-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0381-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0383-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0382-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/0383-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0382-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0384-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0383-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0384-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0383-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0385-Improved-Watchdog-Support.patch b/patches/server/0384-Improved-Watchdog-Support.patch
similarity index 100%
rename from patches/server/0385-Improved-Watchdog-Support.patch
rename to patches/server/0384-Improved-Watchdog-Support.patch
diff --git a/patches/server/0386-Optimize-Pathfinding.patch b/patches/server/0385-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0386-Optimize-Pathfinding.patch
rename to patches/server/0385-Optimize-Pathfinding.patch
diff --git a/patches/server/0387-Reduce-Either-Optional-allocation.patch b/patches/server/0386-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0387-Reduce-Either-Optional-allocation.patch
rename to patches/server/0386-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0388-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0387-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0388-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0387-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0389-Prevent-opening-inventories-when-frozen.patch b/patches/server/0388-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0389-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0388-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0390-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0389-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from patches/server/0390-Optimise-ArraySetSorted-removeIf.patch
rename to patches/server/0389-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0391-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0390-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0391-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0390-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0392-Implement-Player-Client-Options-API.patch b/patches/server/0391-Implement-Player-Client-Options-API.patch
similarity index 98%
rename from patches/server/0392-Implement-Player-Client-Options-API.patch
rename to patches/server/0391-Implement-Player-Client-Options-API.patch
index 4341240c5..afb98eb2c 100644
--- a/patches/server/0392-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0391-Implement-Player-Client-Options-API.patch
@@ -97,7 +97,7 @@ index 02a84c3f3ca6b591a1c475b5cf3357cebd41eff6..8ef5f67c0b51bb5d527b36c667a5c235
          if (getMainArm() != packet.mainHand()) {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 40e6f19449f5d87616097bb3e83fbf1ce796685c..7a64562326cc462c448245a28fdbcce08fe30310 100644
+index f53b4041fc9ce961350649666521e3cf359cdfc1..7d42e60ec26f3617bb23c12f415b13e5913603fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -574,6 +574,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0393-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0392-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0393-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0392-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0394-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0393-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from patches/server/0394-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to patches/server/0393-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/0395-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0394-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 100%
rename from patches/server/0395-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0394-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0396-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0395-Load-Chunks-for-Login-Asynchronously.patch
similarity index 99%
rename from patches/server/0396-Load-Chunks-for-Login-Asynchronously.patch
rename to patches/server/0395-Load-Chunks-for-Login-Asynchronously.patch
index 42580333e..c391433ce 100644
--- a/patches/server/0396-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/server/0395-Load-Chunks-for-Login-Asynchronously.patch
@@ -74,7 +74,7 @@ index 912e98d589f7469c6ea000d28f87e3fbe1ef3aab..766a5ce5d18aed80e37075f7cfc3b6cb
          this.server.getProfiler().push("keepAlive");
          // Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 1e4c306569fa96327dc99bb5dd6b3a749e60813e..a5c933260099a3c28d7655b4fb1ec2917f2fc21c 100644
+index b070624c7ee85b6692f1f44ded6c78139925b669..22a2380388ed9fd6d28edbfbbb5ed3f646217525 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -93,7 +93,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0397-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0396-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/0397-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0396-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0398-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0397-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0398-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0397-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0399-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0398-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0399-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0398-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0400-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0399-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0400-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0399-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0401-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0400-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 99%
rename from patches/server/0401-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0400-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 5e4dcd672..590d94a71 100644
--- a/patches/server/0401-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0400-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -135,7 +135,7 @@ index cd54fa8f7bbcb6036e90f4ef7cdc01d7af835a13..808e564789d826c1778c053ab91038e3
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 27733f7737945b400d31b432178d792d0b79977d..1e16264b533c2205098c0569fadb8e369a032764 100644
+index 5e1f13641140dca8982af8fd876230f7700c54a7..cd28e59602cba810c0c123f01b992f6eef0ea207 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -818,6 +818,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0402-Villager-Restocks-API.patch b/patches/server/0401-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0402-Villager-Restocks-API.patch
rename to patches/server/0401-Villager-Restocks-API.patch
diff --git a/patches/server/0403-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0402-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/0403-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0402-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0404-Expose-game-version.patch b/patches/server/0403-Expose-game-version.patch
similarity index 89%
rename from patches/server/0404-Expose-game-version.patch
rename to patches/server/0403-Expose-game-version.patch
index 206df83fe..59faf17e1 100644
--- a/patches/server/0404-Expose-game-version.patch
+++ b/patches/server/0403-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d6b9fb609a3ebd4afb561a829c14e077004e2bc4..62014dffdfda6a72ea9c6ba57bc7f9ce380f45a9 100644
+index 10d81c2300b17b9d8981450fc03915dba7f458d1..09a9148e74a9924e288a5e419ba2f7054c415394 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -568,6 +568,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0405-Optimize-Voxel-Shape-Merging.patch b/patches/server/0404-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0405-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0404-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0405-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0405-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0407-misc-debugging-dumps.patch b/patches/server/0406-misc-debugging-dumps.patch
similarity index 94%
rename from patches/server/0407-misc-debugging-dumps.patch
rename to patches/server/0406-misc-debugging-dumps.patch
index a2d2ed3bd..6c94ad87f 100644
--- a/patches/server/0407-misc-debugging-dumps.patch
+++ b/patches/server/0406-misc-debugging-dumps.patch
@@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 60648e7c3c86176631d9a3ffdf21f6d236eabd79..7e59359423c1a1970c25246f50ace91f04c70aeb 100644
+index 691fbbb720a3a58aa4e0daee715e9ce36d37ec4c..59ad3053c951457602899462ac548038151fee62 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -868,6 +868,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -58,7 +58,7 @@ index 60648e7c3c86176631d9a3ffdf21f6d236eabd79..7e59359423c1a1970c25246f50ace91f
          this.running = false;
          if (flag) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index a5c933260099a3c28d7655b4fb1ec2917f2fc21c..a0d694ad78576fe77f0d99269d15a0fc0cdda035 100644
+index 22a2380388ed9fd6d28edbfbbb5ed3f646217525..ae93ca7bcc7347ee165cbb0e9fd20aa3da54616c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -206,6 +206,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
@@ -74,7 +74,7 @@ index a5c933260099a3c28d7655b4fb1ec2917f2fc21c..a0d694ad78576fe77f0d99269d15a0fc
                  this.connection.send(new ClientboundDisconnectPacket(ichatmutablecomponent));
                  this.connection.disconnect(ichatmutablecomponent);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 62014dffdfda6a72ea9c6ba57bc7f9ce380f45a9..29cedf6164e00779fd47f98ad8febb0627df2b9f 100644
+index 09a9148e74a9924e288a5e419ba2f7054c415394..2bbbb509c35b178d56119214bef446b2682694a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -991,6 +991,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0408-Prevent-teleporting-dead-entities.patch b/patches/server/0407-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from patches/server/0408-Prevent-teleporting-dead-entities.patch
rename to patches/server/0407-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0408-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 99%
rename from patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0408-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 08c42ae66..e36088dbc 100644
--- a/patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0408-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -536,7 +536,7 @@ index 72932b13d71f71896f07810c8850eb45749ae2e6..5c92aa1cc1a7e7fd0b7a06ae9b21e734
          if ( !this.message.startsWith("/") )
          {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 5b6a51d17575bf8bec664ee0661c57a7975be80d..5b4e9721841db730f48b5f44b6cefc13e3b81dcc 100644
+index e585cdd8a598df2b04c265d5568f8ba868018178..a44a9b4b3c78395cdd1d859407a880cb54386d86 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -200,6 +200,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0410-Implement-Mob-Goal-API.patch b/patches/server/0409-Implement-Mob-Goal-API.patch
similarity index 99%
rename from patches/server/0410-Implement-Mob-Goal-API.patch
rename to patches/server/0409-Implement-Mob-Goal-API.patch
index 9983de833..277ebac62 100644
--- a/patches/server/0410-Implement-Mob-Goal-API.patch
+++ b/patches/server/0409-Implement-Mob-Goal-API.patch
@@ -789,7 +789,7 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1a60c91bd1cf171645370a24c3bc3f081b3ecbea..3e6598bcf442b6623df10cc3caaef98f789d4ea9 100644
+index 2bbbb509c35b178d56119214bef446b2682694a9..df53043c9123be95d69a57c9076db23603e03a3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2655,5 +2655,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0411-Add-villager-reputation-API.patch b/patches/server/0410-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0411-Add-villager-reputation-API.patch
rename to patches/server/0410-Add-villager-reputation-API.patch
diff --git a/patches/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0411-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 96%
rename from patches/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0411-Option-for-maximum-exp-value-when-merging-orbs.patch
index f4e39712e..e6d330bc6 100644
--- a/patches/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0411-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 1e16264b533c2205098c0569fadb8e369a032764..80c77b047472b5a6aea1ff22c6a4d550877bff73 100644
+index cd28e59602cba810c0c123f01b992f6eef0ea207..7fd92f0dd2f8a8bcd6a26e91966641c35d35bf91 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -640,16 +640,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0413-ExperienceOrbMergeEvent.patch b/patches/server/0412-ExperienceOrbMergeEvent.patch
similarity index 94%
rename from patches/server/0413-ExperienceOrbMergeEvent.patch
rename to patches/server/0412-ExperienceOrbMergeEvent.patch
index c094c51b5..6f4951481 100644
--- a/patches/server/0413-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0412-ExperienceOrbMergeEvent.patch
@@ -9,7 +9,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 80c77b047472b5a6aea1ff22c6a4d550877bff73..02d89f77d643bcfa52981cb9a8e93688e089dd83 100644
+index 7fd92f0dd2f8a8bcd6a26e91966641c35d35bf91..1507a172d10986f717cbdaae9890e28c917cf4b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -650,7 +650,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0414-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0413-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0414-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0413-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0415-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0414-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0415-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0414-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0416-Potential-bed-API.patch b/patches/server/0415-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0416-Potential-bed-API.patch
rename to patches/server/0415-Potential-bed-API.patch
diff --git a/patches/server/0417-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0416-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 93%
rename from patches/server/0417-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0416-Wait-for-Async-Tasks-during-shutdown.patch
index b498ffd61..b93982751 100644
--- a/patches/server/0417-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0416-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7e59359423c1a1970c25246f50ace91f04c70aeb..17f1fe888c08b53abc667ab9bffb4ae05f370ea8 100644
+index 59ad3053c951457602899462ac548038151fee62..0e745e52e9900ef523abf6c5b33cca2ef2a8a2b6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -907,6 +907,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -22,7 +22,7 @@ index 7e59359423c1a1970c25246f50ace91f04c70aeb..17f1fe888c08b53abc667ab9bffb4ae0
          // CraftBukkit end
          if (this.getConnection() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fc4a7e9bb246a2bd1075cf180949878e8b58cfa4..db644358527a42bc1030ab38d29253aab6f553aa 100644
+index df53043c9123be95d69a57c9076db23603e03a3b..a82aab154b862eaa1c136e3d5cbb25bbe4902ca5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1000,6 +1000,35 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0418-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0417-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0418-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0417-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0419-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0418-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 99%
rename from patches/server/0419-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0418-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 29952ec34..c46873c18 100644
--- a/patches/server/0419-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0418-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -34,7 +34,7 @@ index 38bb502e9f1272020a23a3ef8ebb0cb1a5a251ef..b18b0e1b5e059f08fd3117eaa0fb28a1
  
                      this.level.getProfiler().push("explosion_blocks");
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f47812b84b003ac486a2c100d82368e3242014bc..87d515e0541b6290ce2d32d90ff0545382777a29 100644
+index 59f387fd4e7e4e02ce5759829b3121a9a7e3aff0..7481f7828d66623c9d606761ca37e53138eacb26 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -430,6 +430,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0420-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0419-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0420-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0419-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0421-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0420-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/0421-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0420-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0422-Ensure-safe-gateway-teleport.patch b/patches/server/0421-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0422-Ensure-safe-gateway-teleport.patch
rename to patches/server/0421-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0423-Add-option-for-console-having-all-permissions.patch b/patches/server/0422-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0423-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0422-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0424-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0423-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 100%
rename from patches/server/0424-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0423-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0424-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0424-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0426-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0425-Optimize-ServerLevels-chunk-level-checking-methods.patch
similarity index 100%
rename from patches/server/0426-Optimize-ServerLevels-chunk-level-checking-methods.patch
rename to patches/server/0425-Optimize-ServerLevels-chunk-level-checking-methods.patch
diff --git a/patches/server/0427-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0426-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from patches/server/0427-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to patches/server/0426-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/patches/server/0428-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0427-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0428-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0427-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0429-Maps-shouldn-t-load-chunks.patch b/patches/server/0428-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0429-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0428-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0430-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0429-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0430-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0429-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0431-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0430-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0431-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0430-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0432-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0431-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0432-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0431-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0433-Fix-sand-duping.patch b/patches/server/0432-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0433-Fix-sand-duping.patch
rename to patches/server/0432-Fix-sand-duping.patch
diff --git a/patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0433-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0433-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0434-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0434-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0436-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0435-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0436-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0435-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0437-Improve-Arrow-API.patch b/patches/server/0436-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0437-Improve-Arrow-API.patch
rename to patches/server/0436-Improve-Arrow-API.patch
diff --git a/patches/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0437-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0437-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0439-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0438-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0439-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0438-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0440-Add-permission-for-command-blocks.patch b/patches/server/0439-Add-permission-for-command-blocks.patch
similarity index 100%
rename from patches/server/0440-Add-permission-for-command-blocks.patch
rename to patches/server/0439-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0441-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0440-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/0441-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0440-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0441-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 97%
rename from patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0441-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 1e8f2ac41..ef66cbf7b 100644
--- a/patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0441-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -8,7 +8,7 @@ makes it so that the server keeps the last difficulty used instead
 of restoring the server.properties every single load.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 17f1fe888c08b53abc667ab9bffb4ae05f370ea8..5ff10579b1ae3a7070c0548d3e5e2fae886ca6f7 100644
+index 0e745e52e9900ef523abf6c5b33cca2ef2a8a2b6..d40623b3ed69a0821057f82e6164b4c94b4a7087 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -788,7 +788,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -102,7 +102,7 @@ index 32786e1c13ffda722aaabf518e2ace7f13e0bf96..08d28184c7e90878b72a606c7800cfff
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 71e9dae49851467de50a5a2f3c202e19ac718099..16976aaa643d2033328703c2f77a8901af9ba806 100644
+index a82aab154b862eaa1c136e3d5cbb25bbe4902ca5..47f08915f821af2ddac80c58a484061ba51eeade 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -940,8 +940,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0443-Paper-dumpitem-command.patch b/patches/server/0442-Paper-dumpitem-command.patch
similarity index 96%
rename from patches/server/0443-Paper-dumpitem-command.patch
rename to patches/server/0442-Paper-dumpitem-command.patch
index a14af4a52..a889ec06a 100644
--- a/patches/server/0443-Paper-dumpitem-command.patch
+++ b/patches/server/0442-Paper-dumpitem-command.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Paper dumpitem command
 Let's you quickly view the item in your hands NBT data
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 610af917885fa1c86f4258a0cc36a488c0ab4b06..5ab7f0b6db9a25792aa99e90504ae75512bffc63 100644
+index fb2cb76e4954d9d69b4a631d6e20bdcc511b6b3f..27c350c123b4349b8b401a06f204de46c88da7ac 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -31,7 +31,9 @@ import org.bukkit.command.CommandSender;
diff --git a/patches/server/0444-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0443-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/0444-Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/0443-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0445-Improve-Legacy-Component-serialization-size.patch b/patches/server/0444-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0445-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0444-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0446-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0445-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0446-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0445-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0446-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 98%
rename from patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0446-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index d90b191ee..56b65d200 100644
--- a/patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0446-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 55416f187c9e35c810162c5ead1375421d6b3d4b..0fa7ec60b30bfc3c3f858aa2a5a7f0fc73d3b6a5 100644
+index 47f08915f821af2ddac80c58a484061ba51eeade..e0c7109a78977118a30b6eb3b54cb896f8c7100e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -354,7 +354,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0448-incremental-chunk-and-player-saving.patch b/patches/server/0447-incremental-chunk-and-player-saving.patch
similarity index 100%
rename from patches/server/0448-incremental-chunk-and-player-saving.patch
rename to patches/server/0447-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0449-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0448-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0449-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0448-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0450-Support-old-UUID-format-for-NBT.patch b/patches/server/0449-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0450-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0449-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0451-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0450-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0451-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0450-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0452-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0451-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0452-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0451-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0453-Remove-some-streams-from-structures.patch b/patches/server/0452-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0453-Remove-some-streams-from-structures.patch
rename to patches/server/0452-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0454-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0453-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0454-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0453-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0455-Support-components-in-ItemMeta.patch b/patches/server/0454-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0455-Support-components-in-ItemMeta.patch
rename to patches/server/0454-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0456-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0455-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0456-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0455-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0457-Add-entity-liquid-API.patch b/patches/server/0456-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0457-Add-entity-liquid-API.patch
rename to patches/server/0456-Add-entity-liquid-API.patch
diff --git a/patches/server/0458-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0457-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0458-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0457-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0459-Spawn-player-in-correct-world-on-login.patch b/patches/server/0458-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0459-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0458-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0460-Add-PrepareResultEvent.patch b/patches/server/0459-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0460-Add-PrepareResultEvent.patch
rename to patches/server/0459-Add-PrepareResultEvent.patch
diff --git a/patches/server/0461-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0460-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0461-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0460-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0462-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0461-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from patches/server/0462-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to patches/server/0461-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/server/0463-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0462-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0463-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0462-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0464-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0463-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0464-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0463-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0465-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0464-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0465-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0464-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0466-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0465-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0466-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0465-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0467-Fix-SPIGOT-5989.patch b/patches/server/0466-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0467-Fix-SPIGOT-5989.patch
rename to patches/server/0466-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0468-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0467-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0468-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0467-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0469-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0468-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0469-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0468-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0470-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0469-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0470-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0469-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0471-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0470-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0471-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0470-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0472-Fix-some-rails-connecting-improperly.patch b/patches/server/0471-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0472-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0471-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0473-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0472-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0473-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0472-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0474-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0473-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0474-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0473-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0475-Brand-support.patch b/patches/server/0474-Brand-support.patch
similarity index 100%
rename from patches/server/0475-Brand-support.patch
rename to patches/server/0474-Brand-support.patch
diff --git a/patches/server/0476-Add-setMaxPlayers-API.patch b/patches/server/0475-Add-setMaxPlayers-API.patch
similarity index 94%
rename from patches/server/0476-Add-setMaxPlayers-API.patch
rename to patches/server/0475-Add-setMaxPlayers-API.patch
index 5fe14b208..84059b6b6 100644
--- a/patches/server/0476-Add-setMaxPlayers-API.patch
+++ b/patches/server/0475-Add-setMaxPlayers-API.patch
@@ -18,7 +18,7 @@ index be7a25560cd5521ddfe4793c7e51b1036fc8a19c..869fa7c3913185c3537185426e75c076
      private int simulationDistance;
      private boolean allowCheatsForAllPlayers;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0fa7ec60b30bfc3c3f858aa2a5a7f0fc73d3b6a5..a3ac723a675bbb0dc098ee045dc4612591b3cc63 100644
+index e0c7109a78977118a30b6eb3b54cb896f8c7100e..e824869ede5b6bd531609c2f4e5cb7edfafb4904 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -663,6 +663,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0477-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0476-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0477-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0476-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0478-Don-t-require-FACING-data.patch b/patches/server/0477-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0478-Don-t-require-FACING-data.patch
rename to patches/server/0477-Don-t-require-FACING-data.patch
diff --git a/patches/server/0479-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0478-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0479-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0478-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0480-Add-moon-phase-API.patch b/patches/server/0479-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0480-Add-moon-phase-API.patch
rename to patches/server/0479-Add-moon-phase-API.patch
diff --git a/patches/server/0481-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0480-Improve-Chunk-Status-Transition-Speed.patch
similarity index 100%
rename from patches/server/0481-Improve-Chunk-Status-Transition-Speed.patch
rename to patches/server/0480-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/patches/server/0482-Prevent-headless-pistons-from-being-created.patch b/patches/server/0481-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0482-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0481-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0483-Add-BellRingEvent.patch b/patches/server/0482-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0483-Add-BellRingEvent.patch
rename to patches/server/0482-Add-BellRingEvent.patch
diff --git a/patches/server/0484-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0483-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0484-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0483-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0485-Buffer-joins-to-world.patch b/patches/server/0484-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0485-Buffer-joins-to-world.patch
rename to patches/server/0484-Buffer-joins-to-world.patch
diff --git a/patches/server/0486-Eigencraft-redstone-implementation.patch b/patches/server/0485-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0486-Eigencraft-redstone-implementation.patch
rename to patches/server/0485-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0487-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0486-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0487-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0486-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0488-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0487-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0488-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0487-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0489-Fix-CraftTeam-null-check.patch b/patches/server/0488-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0489-Fix-CraftTeam-null-check.patch
rename to patches/server/0488-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0490-Add-more-Evoker-API.patch b/patches/server/0489-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0490-Add-more-Evoker-API.patch
rename to patches/server/0489-Add-more-Evoker-API.patch
diff --git a/patches/server/0491-Add-methods-to-get-translation-keys.patch b/patches/server/0490-Add-methods-to-get-translation-keys.patch
similarity index 98%
rename from patches/server/0491-Add-methods-to-get-translation-keys.patch
rename to patches/server/0490-Add-methods-to-get-translation-keys.patch
index 63dbe0776..f42ae5eb4 100644
--- a/patches/server/0491-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0490-Add-methods-to-get-translation-keys.patch
@@ -26,7 +26,7 @@ index ea3358905dcd39a1a855d98570457c65dcd7513d..396fb96abed1e77893d8ee8a15cff18c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-index 7d186c7595dbcd109cee2cc16d70d8302b4d6b8f..9bc659a7ab2030e851c85ca511fbba51998563bf 100644
+index a859a675b4bc543e139358223cc92ad5eee3ddb5..31a22f26070059e5379730c1940ff1c5fb109be1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
 +++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
 @@ -194,6 +194,11 @@ public class CraftEnchantment extends Enchantment {
diff --git a/patches/server/0492-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0491-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0492-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0491-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0493-Cache-block-data-strings.patch b/patches/server/0492-Cache-block-data-strings.patch
similarity index 97%
rename from patches/server/0493-Cache-block-data-strings.patch
rename to patches/server/0492-Cache-block-data-strings.patch
index b97ee9f80..a2ed6ed12 100644
--- a/patches/server/0493-Cache-block-data-strings.patch
+++ b/patches/server/0492-Cache-block-data-strings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 67ba7274461ed438014cc208326a2c3fe7a2e43e..087e43bee2dad3c4fd9e84b6c81830d36bdec0fa 100644
+index 54a155295ed2ee2386f180bf8f5d413984febe96..adb0389c5b38fce4bab47e4cc748cfd95de13e90 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1997,6 +1997,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0494-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0493-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0494-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0493-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0495-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0494-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0495-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0494-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0496-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0495-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0496-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0495-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0497-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0496-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0497-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0496-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0498-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0497-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from patches/server/0498-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0497-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0499-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0498-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0499-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0498-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0500-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0499-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0500-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0499-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0501-Entity-isTicking.patch b/patches/server/0500-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0501-Entity-isTicking.patch
rename to patches/server/0500-Entity-isTicking.patch
diff --git a/patches/server/0502-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0501-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 94%
rename from patches/server/0502-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0501-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 94feafae9..1ae9fe75b 100644
--- a/patches/server/0502-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0501-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 087e43bee2dad3c4fd9e84b6c81830d36bdec0fa..377c0011cd5c9d51360ff78e314d82259482ae35 100644
+index adb0389c5b38fce4bab47e4cc748cfd95de13e90..0060211b3d85c07b44be3d3a534dcb8e35547d78 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2063,13 +2063,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0503-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0502-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0503-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0502-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0504-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0503-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0504-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0503-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0505-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0504-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0505-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0504-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0506-Optimise-getType-calls.patch b/patches/server/0505-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0506-Optimise-getType-calls.patch
rename to patches/server/0505-Optimise-getType-calls.patch
diff --git a/patches/server/0507-Villager-resetOffers.patch b/patches/server/0506-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0507-Villager-resetOffers.patch
rename to patches/server/0506-Villager-resetOffers.patch
diff --git a/patches/server/0508-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0507-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0508-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0507-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0509-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0508-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 93%
rename from patches/server/0509-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0508-Retain-block-place-order-when-capturing-blockstates.patch
index 6c1fa9ad0..6f15a38bf 100644
--- a/patches/server/0509-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0508-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
 cases where a captured entry is overriden) - but for now this will do.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 87d515e0541b6290ce2d32d90ff0545382777a29..690efb366042604008a31ad6e9624b6d05e5b979 100644
+index 7481f7828d66623c9d606761ca37e53138eacb26..bd04c33ae31bfaed508ac5d39db7cb1fd5cf2913 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -155,7 +155,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0510-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0509-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0510-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0509-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0511-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0510-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0511-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0510-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0512-Player-elytra-boost-API.patch b/patches/server/0511-Player-elytra-boost-API.patch
similarity index 94%
rename from patches/server/0512-Player-elytra-boost-API.patch
rename to patches/server/0511-Player-elytra-boost-API.patch
index f6d734783..7747c5bd6 100644
--- a/patches/server/0512-Player-elytra-boost-API.patch
+++ b/patches/server/0511-Player-elytra-boost-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7ba16160dcd74bc41bbd3102124aba9d19b3eb5f..e700ca8a3b3d381bb02476603849ea94d7e4413d 100644
+index a9b80431323b71f171185b4c7bdc2f323c1de124..0bd14df2d73a59dd7c184bc10e46cabec42e00b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -592,6 +592,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0513-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0512-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0513-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0512-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0514-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0513-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0514-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0513-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0515-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0514-Add-getOfflinePlayerIfCached-String.patch
similarity index 93%
rename from patches/server/0515-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0514-Add-getOfflinePlayerIfCached-String.patch
index 3b1e6280b..8696f0d6e 100644
--- a/patches/server/0515-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0514-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a3ac723a675bbb0dc098ee045dc4612591b3cc63..19aa748a38ab2d53cfe8a5f2ce95a285ae5fc957 100644
+index e824869ede5b6bd531609c2f4e5cb7edfafb4904..41eaca0ef3d5d309fab7e7dddff0310d24c88966 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1782,6 +1782,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0516-Add-ignore-discounts-API.patch b/patches/server/0515-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0516-Add-ignore-discounts-API.patch
rename to patches/server/0515-Add-ignore-discounts-API.patch
diff --git a/patches/server/0517-Toggle-for-removing-existing-dragon.patch b/patches/server/0516-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0517-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0516-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0518-Fix-client-lag-on-advancement-loading.patch b/patches/server/0517-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0518-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0517-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0519-Item-no-age-no-player-pickup.patch b/patches/server/0518-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0519-Item-no-age-no-player-pickup.patch
rename to patches/server/0518-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0520-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0519-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0520-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0519-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0521-Beacon-API-custom-effect-ranges.patch b/patches/server/0520-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0521-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0520-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0522-Add-API-for-quit-reason.patch b/patches/server/0521-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0522-Add-API-for-quit-reason.patch
rename to patches/server/0521-Add-API-for-quit-reason.patch
diff --git a/patches/server/0523-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0522-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0523-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0522-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0524-Expose-world-spawn-angle.patch b/patches/server/0523-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0524-Expose-world-spawn-angle.patch
rename to patches/server/0523-Expose-world-spawn-angle.patch
diff --git a/patches/server/0525-Add-Destroy-Speed-API.patch b/patches/server/0524-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0525-Add-Destroy-Speed-API.patch
rename to patches/server/0524-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0525-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 93%
rename from patches/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0525-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index e63b70f28..6b1ec53b1 100644
--- a/patches/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0525-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e700ca8a3b3d381bb02476603849ea94d7e4413d..772c7c34df1938efb4f97ef21ba39d75a5b8a1a5 100644
+index 0bd14df2d73a59dd7c184bc10e46cabec42e00b4..23a92393036fea7631d7610b12d4e72fa6657203 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2254,7 +2254,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0527-Add-LivingEntity-clearActiveItem.patch b/patches/server/0526-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0527-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0526-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0528-Add-PlayerItemCooldownEvent.patch b/patches/server/0527-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0528-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0527-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0528-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0528-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0530-More-lightning-API.patch b/patches/server/0529-More-lightning-API.patch
similarity index 100%
rename from patches/server/0530-More-lightning-API.patch
rename to patches/server/0529-More-lightning-API.patch
diff --git a/patches/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0530-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0530-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0532-Added-missing-default-perms-for-commands.patch b/patches/server/0531-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0532-Added-missing-default-perms-for-commands.patch
rename to patches/server/0531-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0533-Add-PlayerShearBlockEvent.patch b/patches/server/0532-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0533-Add-PlayerShearBlockEvent.patch
rename to patches/server/0532-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0534-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0533-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0534-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0533-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0535-Limit-recipe-packets.patch b/patches/server/0534-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0535-Limit-recipe-packets.patch
rename to patches/server/0534-Limit-recipe-packets.patch
diff --git a/patches/server/0536-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0535-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0536-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0535-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0537-Player-Chunk-Load-Unload-Events.patch b/patches/server/0536-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0537-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0536-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0538-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0537-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0538-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0537-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0539-Expose-LivingEntity-hurt-direction.patch b/patches/server/0538-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0539-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0538-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0539-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0539-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0540-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0540-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0541-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0541-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0543-Implement-TargetHitEvent.patch b/patches/server/0542-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0543-Implement-TargetHitEvent.patch
rename to patches/server/0542-Implement-TargetHitEvent.patch
diff --git a/patches/server/0544-Additional-Block-Material-API-s.patch b/patches/server/0543-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0544-Additional-Block-Material-API-s.patch
rename to patches/server/0543-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0545-Fix-harming-potion-dupe.patch b/patches/server/0544-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0545-Fix-harming-potion-dupe.patch
rename to patches/server/0544-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0545-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0545-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0547-Cache-burn-durations.patch b/patches/server/0546-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0547-Cache-burn-durations.patch
rename to patches/server/0546-Cache-burn-durations.patch
diff --git a/patches/server/0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0547-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0547-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0549-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0548-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0549-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0548-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0550-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0549-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0550-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0549-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0550-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0550-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0552-Zombie-API-breaking-doors.patch b/patches/server/0551-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0552-Zombie-API-breaking-doors.patch
rename to patches/server/0551-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0553-Fix-nerfed-slime-when-splitting.patch b/patches/server/0552-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0553-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0552-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0554-Add-EntityLoadCrossbowEvent.patch b/patches/server/0553-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0554-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0553-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0555-Guardian-beam-workaround.patch b/patches/server/0554-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0555-Guardian-beam-workaround.patch
rename to patches/server/0554-Guardian-beam-workaround.patch
diff --git a/patches/server/0556-Added-WorldGameRuleChangeEvent.patch b/patches/server/0555-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0556-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0555-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0557-Added-ServerResourcesReloadedEvent.patch b/patches/server/0556-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0557-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0556-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0557-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0557-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0559-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0558-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0559-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0558-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0560-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0559-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0560-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0559-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0561-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0560-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0561-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0560-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0562-Configurable-door-breaking-difficulty.patch b/patches/server/0561-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0562-Configurable-door-breaking-difficulty.patch
rename to patches/server/0561-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0563-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0562-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0563-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0562-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0563-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0563-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0565-Remove-stale-POIs.patch b/patches/server/0564-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0565-Remove-stale-POIs.patch
rename to patches/server/0564-Remove-stale-POIs.patch
diff --git a/patches/server/0566-Fix-villager-boat-exploit.patch b/patches/server/0565-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0566-Fix-villager-boat-exploit.patch
rename to patches/server/0565-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0567-Add-sendOpLevel-API.patch b/patches/server/0566-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0567-Add-sendOpLevel-API.patch
rename to patches/server/0566-Add-sendOpLevel-API.patch
diff --git a/patches/server/0568-Add-PaperRegistry.patch b/patches/server/0567-Add-PaperRegistry.patch
similarity index 100%
rename from patches/server/0568-Add-PaperRegistry.patch
rename to patches/server/0567-Add-PaperRegistry.patch
diff --git a/patches/server/0569-Add-StructuresLocateEvent.patch b/patches/server/0568-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0569-Add-StructuresLocateEvent.patch
rename to patches/server/0568-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0570-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0569-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0570-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0569-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0570-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0570-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0572-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0571-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0572-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0571-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0573-Make-schedule-command-per-world.patch b/patches/server/0572-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0573-Make-schedule-command-per-world.patch
rename to patches/server/0572-Make-schedule-command-per-world.patch
diff --git a/patches/server/0574-Configurable-max-leash-distance.patch b/patches/server/0573-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0574-Configurable-max-leash-distance.patch
rename to patches/server/0573-Configurable-max-leash-distance.patch
diff --git a/patches/server/0575-Implement-BlockPreDispenseEvent.patch b/patches/server/0574-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0575-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0574-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0575-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0575-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0576-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0576-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0578-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0577-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0578-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0577-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0578-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0578-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0580-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0579-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0580-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0579-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0581-add-DragonEggFormEvent.patch b/patches/server/0580-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0581-add-DragonEggFormEvent.patch
rename to patches/server/0580-add-DragonEggFormEvent.patch
diff --git a/patches/server/0582-EntityMoveEvent.patch b/patches/server/0581-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0582-EntityMoveEvent.patch
rename to patches/server/0581-EntityMoveEvent.patch
diff --git a/patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0582-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0582-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0584-Inline-shift-direction-fields.patch b/patches/server/0583-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0584-Inline-shift-direction-fields.patch
rename to patches/server/0583-Inline-shift-direction-fields.patch
diff --git a/patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0584-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0584-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0585-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0585-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0587-living-entity-allow-attribute-registration.patch b/patches/server/0586-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0587-living-entity-allow-attribute-registration.patch
rename to patches/server/0586-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0588-fix-dead-slime-setSize-invincibility.patch b/patches/server/0587-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0588-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0587-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0588-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0588-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0590-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0589-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0590-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0589-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0591-Expose-Tracked-Players.patch b/patches/server/0590-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0591-Expose-Tracked-Players.patch
rename to patches/server/0590-Expose-Tracked-Players.patch
diff --git a/patches/server/0592-Remove-streams-from-SensorNearest.patch b/patches/server/0591-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0592-Remove-streams-from-SensorNearest.patch
rename to patches/server/0591-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0593-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0592-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0593-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0592-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0594-Improve-ServerGUI.patch b/patches/server/0593-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0594-Improve-ServerGUI.patch
rename to patches/server/0593-Improve-ServerGUI.patch
diff --git a/patches/server/0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0594-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0594-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0596-fix-converting-txt-to-json-file.patch b/patches/server/0595-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0596-fix-converting-txt-to-json-file.patch
rename to patches/server/0595-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0597-Add-worldborder-events.patch b/patches/server/0596-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0597-Add-worldborder-events.patch
rename to patches/server/0596-Add-worldborder-events.patch
diff --git a/patches/server/0598-added-PlayerNameEntityEvent.patch b/patches/server/0597-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0598-added-PlayerNameEntityEvent.patch
rename to patches/server/0597-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0599-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0598-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0599-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0598-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0600-Add-recipe-to-cook-events.patch b/patches/server/0599-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0600-Add-recipe-to-cook-events.patch
rename to patches/server/0599-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0601-Add-Block-isValidTool.patch b/patches/server/0600-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0601-Add-Block-isValidTool.patch
rename to patches/server/0600-Add-Block-isValidTool.patch
diff --git a/patches/server/0602-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0601-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0602-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0601-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0603-Expand-world-key-API.patch b/patches/server/0602-Expand-world-key-API.patch
similarity index 100%
rename from patches/server/0603-Expand-world-key-API.patch
rename to patches/server/0602-Expand-world-key-API.patch
diff --git a/patches/server/0604-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0603-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0604-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0603-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0605-Item-Rarity-API.patch b/patches/server/0604-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0605-Item-Rarity-API.patch
rename to patches/server/0604-Item-Rarity-API.patch
diff --git a/patches/server/0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0605-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0605-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0607-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0606-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0607-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0606-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0607-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0607-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0609-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0608-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0609-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0608-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0609-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0609-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0611-Entity-load-save-limit-per-chunk.patch b/patches/server/0610-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0611-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0610-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0612-Expose-protocol-version.patch b/patches/server/0611-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0612-Expose-protocol-version.patch
rename to patches/server/0611-Expose-protocol-version.patch
diff --git a/patches/server/0613-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0612-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from patches/server/0613-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0612-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0614-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0613-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0614-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0613-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0614-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0614-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0616-Add-bypass-host-check.patch b/patches/server/0615-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0616-Add-bypass-host-check.patch
rename to patches/server/0615-Add-bypass-host-check.patch
diff --git a/patches/server/0617-Set-area-affect-cloud-rotation.patch b/patches/server/0616-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0617-Set-area-affect-cloud-rotation.patch
rename to patches/server/0616-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0617-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0617-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0619-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0618-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0619-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0618-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0620-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0619-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0620-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0619-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0621-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0620-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0621-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0620-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0622-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0621-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0622-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0621-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0624-Added-PlayerDeepSleepEvent.patch b/patches/server/0623-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0624-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0623-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0625-More-World-API.patch b/patches/server/0624-More-World-API.patch
similarity index 100%
rename from patches/server/0625-More-World-API.patch
rename to patches/server/0624-More-World-API.patch
diff --git a/patches/server/0626-Added-PlayerBedFailEnterEvent.patch b/patches/server/0625-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0626-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0625-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0627-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0626-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0627-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0626-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0629-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0628-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0629-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0628-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0629-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0629-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0631-Add-Channel-initialization-listeners.patch b/patches/server/0630-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0631-Add-Channel-initialization-listeners.patch
rename to patches/server/0630-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0632-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0631-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0632-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0631-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0633-Add-more-WanderingTrader-API.patch b/patches/server/0632-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0633-Add-more-WanderingTrader-API.patch
rename to patches/server/0632-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0634-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0633-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0634-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0633-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0634-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0634-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0637-Inventory-close.patch b/patches/server/0636-Inventory-close.patch
similarity index 100%
rename from patches/server/0637-Inventory-close.patch
rename to patches/server/0636-Inventory-close.patch
diff --git a/patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0637-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0637-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0638-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0638-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0640-Fix-CraftPotionBrewer-cache.patch b/patches/server/0639-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0640-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0639-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0641-Add-basic-Datapack-API.patch b/patches/server/0640-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0641-Add-basic-Datapack-API.patch
rename to patches/server/0640-Add-basic-Datapack-API.patch
diff --git a/patches/server/0642-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0641-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0642-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0641-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0644-ItemStack-repair-check-API.patch b/patches/server/0643-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0644-ItemStack-repair-check-API.patch
rename to patches/server/0643-ItemStack-repair-check-API.patch
diff --git a/patches/server/0645-More-Enchantment-API.patch b/patches/server/0644-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0645-More-Enchantment-API.patch
rename to patches/server/0644-More-Enchantment-API.patch
diff --git a/patches/server/0646-Move-range-check-for-block-placing-up.patch b/patches/server/0645-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0646-Move-range-check-for-block-placing-up.patch
rename to patches/server/0645-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0647-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0646-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0647-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0646-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0648-Add-Mob-lookAt-API.patch b/patches/server/0647-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0648-Add-Mob-lookAt-API.patch
rename to patches/server/0647-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0649-Add-Unix-domain-socket-support.patch b/patches/server/0648-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0649-Add-Unix-domain-socket-support.patch
rename to patches/server/0648-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0650-Add-EntityInsideBlockEvent.patch b/patches/server/0649-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0650-Add-EntityInsideBlockEvent.patch
rename to patches/server/0649-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0651-Attributes-API-for-item-defaults.patch b/patches/server/0650-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0651-Attributes-API-for-item-defaults.patch
rename to patches/server/0650-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0651-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0651-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0653-More-Lidded-Block-API.patch b/patches/server/0652-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0653-More-Lidded-Block-API.patch
rename to patches/server/0652-More-Lidded-Block-API.patch
diff --git a/patches/server/0654-Limit-item-frame-cursors-on-maps.patch b/patches/server/0653-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0654-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0653-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0655-Add-PlayerKickEvent-causes.patch b/patches/server/0654-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0655-Add-PlayerKickEvent-causes.patch
rename to patches/server/0654-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0656-Add-PufferFishStateChangeEvent.patch b/patches/server/0655-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0656-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0655-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0656-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0656-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0657-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0657-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch
similarity index 90%
rename from patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch
index 4b6a75bf8..4cde97de5 100644
--- a/patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to fix items merging through walls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 22437b835c309956f263278db37737251e1503d5..7e927dec3e4e4fb65bf89a87cfa555045c58bb3a 100644
+index b491186d66609046016370e56b96e2c09e7d3a32..ae4b251e10babb07055d031ff48ac7dd5d4be4a0 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -251,6 +251,14 @@ public class ItemEntity extends Entity {
+@@ -247,6 +247,14 @@ public class ItemEntity extends Entity {
                  ItemEntity entityitem = (ItemEntity) iterator.next();
  
                  if (entityitem.isMergable()) {
diff --git a/patches/server/0660-Add-BellRevealRaiderEvent.patch b/patches/server/0659-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0660-Add-BellRevealRaiderEvent.patch
rename to patches/server/0659-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0661-Fix-invulnerable-end-crystals.patch b/patches/server/0660-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0661-Fix-invulnerable-end-crystals.patch
rename to patches/server/0660-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0662-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0661-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0662-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0661-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0663-Fix-dangerous-end-portal-logic.patch b/patches/server/0662-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0663-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0662-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0663-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0663-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0665-Make-item-validations-configurable.patch b/patches/server/0664-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0665-Make-item-validations-configurable.patch
rename to patches/server/0664-Make-item-validations-configurable.patch
diff --git a/patches/server/0666-Line-Of-Sight-Changes.patch b/patches/server/0665-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0666-Line-Of-Sight-Changes.patch
rename to patches/server/0665-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0667-add-per-world-spawn-limits.patch b/patches/server/0666-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0667-add-per-world-spawn-limits.patch
rename to patches/server/0666-add-per-world-spawn-limits.patch
diff --git a/patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0667-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0667-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0669-Add-more-LimitedRegion-API.patch b/patches/server/0668-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0669-Add-more-LimitedRegion-API.patch
rename to patches/server/0668-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0669-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0669-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0671-Missing-Entity-Behavior-API.patch b/patches/server/0670-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0671-Missing-Entity-Behavior-API.patch
rename to patches/server/0670-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0671-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0671-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0672-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0672-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0673-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0673-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0674-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0674-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0676-Adds-PlayerArmSwingEvent.patch b/patches/server/0675-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0676-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0675-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0676-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0676-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0677-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0677-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0679-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0678-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0679-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0678-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0680-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0679-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0680-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0679-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0680-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0680-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0682-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0681-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0682-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0681-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0683-Stinger-API.patch b/patches/server/0682-Stinger-API.patch
similarity index 100%
rename from patches/server/0683-Stinger-API.patch
rename to patches/server/0682-Stinger-API.patch
diff --git a/patches/server/0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0683-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0683-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0685-Add-System.out-err-catcher.patch b/patches/server/0684-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0685-Add-System.out-err-catcher.patch
rename to patches/server/0684-Add-System.out-err-catcher.patch
diff --git a/patches/server/0686-Fix-test-not-bootstrapping.patch b/patches/server/0685-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0686-Fix-test-not-bootstrapping.patch
rename to patches/server/0685-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0686-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0686-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0688-Improve-boat-collision-performance.patch b/patches/server/0687-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0688-Improve-boat-collision-performance.patch
rename to patches/server/0687-Improve-boat-collision-performance.patch
diff --git a/patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0688-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0688-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0689-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0689-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0691-Add-PlayerSetSpawnEvent.patch b/patches/server/0690-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0691-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0690-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0691-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0691-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0693-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0692-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0693-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0692-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0694-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0693-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0694-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0693-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0695-Added-EntityDamageItemEvent.patch b/patches/server/0694-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0695-Added-EntityDamageItemEvent.patch
rename to patches/server/0694-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0696-Optimize-indirect-passenger-iteration.patch b/patches/server/0695-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0696-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0695-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0696-Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/server/0696-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0699-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0698-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0699-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0698-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0700-Clear-bucket-NBT-after-dispense.patch b/patches/server/0699-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0700-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0699-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0700-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0700-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0702-Add-BlockBreakBlockEvent.patch b/patches/server/0701-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0702-Add-BlockBreakBlockEvent.patch
rename to patches/server/0701-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0702-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0702-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0704-More-CommandBlock-API.patch b/patches/server/0703-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0704-More-CommandBlock-API.patch
rename to patches/server/0703-More-CommandBlock-API.patch
diff --git a/patches/server/0705-Add-missing-team-sidebar-display-slots.patch b/patches/server/0704-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0705-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0704-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0706-Add-back-EntityPortalExitEvent.patch b/patches/server/0705-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0706-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0705-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0706-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0706-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0708-Get-entity-default-attributes.patch b/patches/server/0707-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0708-Get-entity-default-attributes.patch
rename to patches/server/0707-Get-entity-default-attributes.patch
diff --git a/patches/server/0709-Left-handed-API.patch b/patches/server/0708-Left-handed-API.patch
similarity index 100%
rename from patches/server/0709-Left-handed-API.patch
rename to patches/server/0708-Left-handed-API.patch
diff --git a/patches/server/0710-Add-advancement-display-API.patch b/patches/server/0709-Add-advancement-display-API.patch
similarity index 100%
rename from patches/server/0710-Add-advancement-display-API.patch
rename to patches/server/0709-Add-advancement-display-API.patch
diff --git a/patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0710-Add-ItemFactory-getMonsterEgg-API.patch
similarity index 100%
rename from patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch
rename to patches/server/0710-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0712-Add-critical-damage-API.patch b/patches/server/0711-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0712-Add-critical-damage-API.patch
rename to patches/server/0711-Add-critical-damage-API.patch
diff --git a/patches/server/0713-Fix-issues-with-mob-conversion.patch b/patches/server/0712-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0713-Fix-issues-with-mob-conversion.patch
rename to patches/server/0712-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0714-Add-isCollidable-methods-to-various-places.patch b/patches/server/0713-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0714-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0713-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0715-Goat-ram-API.patch b/patches/server/0714-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0715-Goat-ram-API.patch
rename to patches/server/0714-Goat-ram-API.patch
diff --git a/patches/server/0716-Add-API-for-resetting-a-single-score.patch b/patches/server/0715-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0716-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0715-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0716-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0716-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0718-Vanilla-command-permission-fixes.patch b/patches/server/0717-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0718-Vanilla-command-permission-fixes.patch
rename to patches/server/0717-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0719-Make-CallbackExecutor-strict-again.patch b/patches/server/0718-Make-CallbackExecutor-strict-again.patch
similarity index 100%
rename from patches/server/0719-Make-CallbackExecutor-strict-again.patch
rename to patches/server/0718-Make-CallbackExecutor-strict-again.patch
diff --git a/patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0719-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
similarity index 100%
rename from patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
rename to patches/server/0719-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0720-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0720-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0721-Correctly-handle-recursion-for-chunkholder-updates.patch
similarity index 100%
rename from patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch
rename to patches/server/0721-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0723-Fix-GameProfileCache-concurrency.patch b/patches/server/0722-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0723-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0722-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0723-Fix-chunks-refusing-to-unload-at-low-TPS.patch
similarity index 100%
rename from patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch
rename to patches/server/0723-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0724-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
similarity index 100%
rename from patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
rename to patches/server/0724-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
diff --git a/patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0725-Do-not-allow-ticket-level-changes-when-updating-chun.patch
similarity index 100%
rename from patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch
rename to patches/server/0725-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0726-Do-not-submit-profile-lookups-to-worldgen-threads.patch
similarity index 100%
rename from patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch
rename to patches/server/0726-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0728-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0727-Log-when-the-async-catcher-is-tripped.patch
similarity index 100%
rename from patches/server/0728-Log-when-the-async-catcher-is-tripped.patch
rename to patches/server/0727-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
similarity index 100%
rename from patches/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
rename to patches/server/0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/0731-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0730-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0731-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0730-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0732-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0731-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0732-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0731-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0733-Optimise-general-POI-access.patch b/patches/server/0732-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0733-Optimise-general-POI-access.patch
rename to patches/server/0732-Optimise-general-POI-access.patch
diff --git a/patches/server/0734-Add-more-async-catchers.patch b/patches/server/0733-Add-more-async-catchers.patch
similarity index 100%
rename from patches/server/0734-Add-more-async-catchers.patch
rename to patches/server/0733-Add-more-async-catchers.patch
diff --git a/patches/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch
similarity index 100%
rename from patches/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch
rename to patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch
diff --git a/patches/server/0736-Optimise-chunk-tick-iteration.patch b/patches/server/0735-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/0736-Optimise-chunk-tick-iteration.patch
rename to patches/server/0735-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0737-Execute-chunk-tasks-mid-tick.patch b/patches/server/0736-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0737-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0736-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0738-Do-not-copy-visible-chunks.patch b/patches/server/0737-Do-not-copy-visible-chunks.patch
similarity index 100%
rename from patches/server/0738-Do-not-copy-visible-chunks.patch
rename to patches/server/0737-Do-not-copy-visible-chunks.patch
diff --git a/patches/server/0739-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0739-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0740-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0739-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0740-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0739-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0741-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0740-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/0741-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0740-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0742-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0741-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0742-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0741-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0743-Distance-manager-tick-timings.patch b/patches/server/0742-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0743-Distance-manager-tick-timings.patch
rename to patches/server/0742-Distance-manager-tick-timings.patch
diff --git a/patches/server/0744-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0743-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0744-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0743-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0745-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0745-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0746-Add-packet-limiter-config.patch b/patches/server/0745-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0746-Add-packet-limiter-config.patch
rename to patches/server/0745-Add-packet-limiter-config.patch
diff --git a/patches/server/0747-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch
similarity index 100%
rename from patches/server/0747-Use-correct-LevelStem-registry-when-loading-default-.patch
rename to patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch
diff --git a/patches/server/0748-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0748-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0749-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0748-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0749-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0748-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0750-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0749-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0750-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0749-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0751-Time-scoreboard-search.patch b/patches/server/0750-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0751-Time-scoreboard-search.patch
rename to patches/server/0750-Time-scoreboard-search.patch
diff --git a/patches/server/0752-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0752-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0753-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0752-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0753-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0752-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0754-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0753-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0754-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0753-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0755-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0754-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0755-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0754-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0756-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch
similarity index 100%
rename from patches/server/0756-Allow-removal-addition-of-entities-to-entity-ticklis.patch
rename to patches/server/0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0757-Optimise-random-block-ticking.patch b/patches/server/0756-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0757-Optimise-random-block-ticking.patch
rename to patches/server/0756-Optimise-random-block-ticking.patch
diff --git a/patches/server/0758-Optimise-non-flush-packet-sending.patch b/patches/server/0757-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0758-Optimise-non-flush-packet-sending.patch
rename to patches/server/0757-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0759-Optimise-nearby-player-lookups.patch b/patches/server/0758-Optimise-nearby-player-lookups.patch
similarity index 100%
rename from patches/server/0759-Optimise-nearby-player-lookups.patch
rename to patches/server/0758-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0760-Optimise-WorldServer-notify.patch b/patches/server/0759-Optimise-WorldServer-notify.patch
similarity index 100%
rename from patches/server/0760-Optimise-WorldServer-notify.patch
rename to patches/server/0759-Optimise-WorldServer-notify.patch
diff --git a/patches/server/0761-Remove-streams-for-villager-AI.patch b/patches/server/0760-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0761-Remove-streams-for-villager-AI.patch
rename to patches/server/0760-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0762-Rewrite-dataconverter-system.patch b/patches/server/0761-Rewrite-dataconverter-system.patch
similarity index 100%
rename from patches/server/0762-Rewrite-dataconverter-system.patch
rename to patches/server/0761-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0763-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0763-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0764-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0764-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0765-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
similarity index 100%
rename from patches/server/0765-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
rename to patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
diff --git a/patches/server/0766-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0765-Async-catch-modifications-to-critical-entity-state.patch
similarity index 100%
rename from patches/server/0766-Async-catch-modifications-to-critical-entity-state.patch
rename to patches/server/0765-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0767-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0766-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0767-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0766-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0768-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0768-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0769-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0768-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0769-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0768-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0770-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0770-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0771-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0771-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0772-Ensure-valid-vehicle-status.patch b/patches/server/0771-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0772-Ensure-valid-vehicle-status.patch
rename to patches/server/0771-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0773-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0772-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0773-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0772-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0774-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0774-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0775-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0774-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0775-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0774-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0776-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0775-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0776-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0775-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0777-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0776-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
similarity index 100%
rename from patches/server/0777-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
rename to patches/server/0776-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
diff --git a/patches/server/0778-Preserve-overstacked-loot.patch b/patches/server/0777-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0778-Preserve-overstacked-loot.patch
rename to patches/server/0777-Preserve-overstacked-loot.patch
diff --git a/patches/server/0779-Update-head-rotation-in-missing-places.patch b/patches/server/0778-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0779-Update-head-rotation-in-missing-places.patch
rename to patches/server/0778-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0780-prevent-unintended-light-block-manipulation.patch b/patches/server/0779-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0780-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0779-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0781-Fix-CraftCriteria-defaults-map.patch b/patches/server/0780-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0781-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0780-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0782-Fix-upstreams-block-state-factories.patch b/patches/server/0781-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0782-Fix-upstreams-block-state-factories.patch
rename to patches/server/0781-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0783-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0782-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/0783-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0782-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0784-Configurable-feature-seeds.patch b/patches/server/0783-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0784-Configurable-feature-seeds.patch
rename to patches/server/0783-Configurable-feature-seeds.patch
diff --git a/patches/server/0785-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0784-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0785-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0784-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0786-Add-root-admin-user-detection.patch b/patches/server/0785-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0786-Add-root-admin-user-detection.patch
rename to patches/server/0785-Add-root-admin-user-detection.patch
diff --git a/patches/server/0787-Always-allow-item-changing-in-Fireball.patch b/patches/server/0786-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0787-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0786-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0788-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0787-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0788-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0787-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0788-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0788-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0790-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0789-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0790-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0789-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0791-Rewrite-the-light-engine.patch b/patches/server/0790-Rewrite-the-light-engine.patch
similarity index 100%
rename from patches/server/0791-Rewrite-the-light-engine.patch
rename to patches/server/0790-Rewrite-the-light-engine.patch
diff --git a/patches/server/0792-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch
similarity index 100%
rename from patches/server/0792-Always-parse-protochunk-light-sources-unless-it-is-m.patch
rename to patches/server/0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0793-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0792-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0793-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0792-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0793-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0793-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0795-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0794-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0795-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0794-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0796-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0795-Fix-kelp-modifier-changing-growth-for-other-crops.patch
similarity index 100%
rename from patches/server/0796-Fix-kelp-modifier-changing-growth-for-other-crops.patch
rename to patches/server/0795-Fix-kelp-modifier-changing-growth-for-other-crops.patch
diff --git a/patches/server/0797-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0796-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0797-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0796-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0798-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0797-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0798-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0797-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0799-Add-player-health-update-API.patch b/patches/server/0798-Add-player-health-update-API.patch
similarity index 100%
rename from patches/server/0799-Add-player-health-update-API.patch
rename to patches/server/0798-Add-player-health-update-API.patch
diff --git a/patches/server/0800-Optimize-HashMapPalette.patch b/patches/server/0799-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0800-Optimize-HashMapPalette.patch
rename to patches/server/0799-Optimize-HashMapPalette.patch
diff --git a/patches/server/0801-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0800-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0801-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0800-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0802-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 100%
rename from patches/server/0802-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0803-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0802-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0803-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0802-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0804-Actually-unload-POI-data.patch b/patches/server/0803-Actually-unload-POI-data.patch
similarity index 100%
rename from patches/server/0804-Actually-unload-POI-data.patch
rename to patches/server/0803-Actually-unload-POI-data.patch
diff --git a/patches/server/0805-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0804-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0805-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0804-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0806-Update-Log4j.patch b/patches/server/0805-Update-Log4j.patch
similarity index 100%
rename from patches/server/0806-Update-Log4j.patch
rename to patches/server/0805-Update-Log4j.patch
diff --git a/patches/server/0807-Add-more-Campfire-API.patch b/patches/server/0806-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0807-Add-more-Campfire-API.patch
rename to patches/server/0806-Add-more-Campfire-API.patch
diff --git a/patches/server/0808-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0807-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0808-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0807-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0809-Fix-tripwire-state-inconsistency.patch b/patches/server/0808-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0809-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0808-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0810-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0809-Fix-fluid-logging-on-Block-breakNaturally.patch
similarity index 100%
rename from patches/server/0810-Fix-fluid-logging-on-Block-breakNaturally.patch
rename to patches/server/0809-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0811-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0810-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0811-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0810-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0812-Improve-scoreboard-entries.patch b/patches/server/0811-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0812-Improve-scoreboard-entries.patch
rename to patches/server/0811-Improve-scoreboard-entries.patch
diff --git a/patches/server/0813-Entity-powdered-snow-API.patch b/patches/server/0812-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0813-Entity-powdered-snow-API.patch
rename to patches/server/0812-Entity-powdered-snow-API.patch
diff --git a/patches/server/0814-Add-API-for-item-entity-health.patch b/patches/server/0813-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0814-Add-API-for-item-entity-health.patch
rename to patches/server/0813-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0815-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0814-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0815-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0814-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0815-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0815-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0817-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0816-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0817-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0816-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0818-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0817-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0818-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0817-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0819-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0818-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0819-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0818-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0820-Fix-bees-aging-inside-hives.patch b/patches/server/0819-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0820-Fix-bees-aging-inside-hives.patch
rename to patches/server/0819-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0821-Bucketable-API.patch b/patches/server/0820-Bucketable-API.patch
similarity index 100%
rename from patches/server/0821-Bucketable-API.patch
rename to patches/server/0820-Bucketable-API.patch
diff --git a/patches/server/0822-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0821-Check-player-world-in-endPortalSoundRadius.patch
similarity index 100%
rename from patches/server/0822-Check-player-world-in-endPortalSoundRadius.patch
rename to patches/server/0821-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0823-Validate-usernames.patch b/patches/server/0822-Validate-usernames.patch
similarity index 100%
rename from patches/server/0823-Validate-usernames.patch
rename to patches/server/0822-Validate-usernames.patch
diff --git a/patches/server/0824-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0823-Fix-saving-configs-with-more-long-comments.patch
similarity index 100%
rename from patches/server/0824-Fix-saving-configs-with-more-long-comments.patch
rename to patches/server/0823-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0825-Make-water-animal-spawn-height-configurable.patch b/patches/server/0824-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0825-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0824-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0826-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0826-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0827-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0826-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0827-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0826-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0828-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0827-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0828-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0827-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0829-Multiple-Entries-with-Scoreboards.patch b/patches/server/0828-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0829-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0828-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0830-Reset-placed-block-on-exception.patch b/patches/server/0829-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0830-Reset-placed-block-on-exception.patch
rename to patches/server/0829-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0831-Add-configurable-height-for-slime-spawn.patch b/patches/server/0830-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0831-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0830-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0832-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0831-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0832-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0831-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0833-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0832-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0833-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0832-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0834-Kick-on-main-for-illegal-chars.patch b/patches/server/0833-Kick-on-main-for-illegal-chars.patch
similarity index 100%
rename from patches/server/0834-Kick-on-main-for-illegal-chars.patch
rename to patches/server/0833-Kick-on-main-for-illegal-chars.patch
diff --git a/patches/server/0835-Multi-Block-Change-API-Implementation.patch b/patches/server/0834-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0835-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0834-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0836-Fix-NotePlayEvent.patch b/patches/server/0835-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0836-Fix-NotePlayEvent.patch
rename to patches/server/0835-Fix-NotePlayEvent.patch
diff --git a/patches/server/0837-Freeze-Tick-Lock-API.patch b/patches/server/0836-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0837-Freeze-Tick-Lock-API.patch
rename to patches/server/0836-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0838-Dolphin-API.patch b/patches/server/0837-Dolphin-API.patch
similarity index 100%
rename from patches/server/0838-Dolphin-API.patch
rename to patches/server/0837-Dolphin-API.patch
diff --git a/patches/server/0839-More-PotionEffectType-API.patch b/patches/server/0838-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0839-More-PotionEffectType-API.patch
rename to patches/server/0838-More-PotionEffectType-API.patch
diff --git a/patches/server/0840-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0839-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0840-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0839-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0841-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0841-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0842-Add-config-for-stronghold-seed.patch b/patches/server/0841-Add-config-for-stronghold-seed.patch
similarity index 100%
rename from patches/server/0842-Add-config-for-stronghold-seed.patch
rename to patches/server/0841-Add-config-for-stronghold-seed.patch
diff --git a/patches/server/0843-Implement-regenerateChunk.patch b/patches/server/0842-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0843-Implement-regenerateChunk.patch
rename to patches/server/0842-Implement-regenerateChunk.patch
diff --git a/patches/server/0844-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0843-Log-exceptions-thrown-during-chat-processing.patch
similarity index 100%
rename from patches/server/0844-Log-exceptions-thrown-during-chat-processing.patch
rename to patches/server/0843-Log-exceptions-thrown-during-chat-processing.patch
diff --git a/patches/server/0845-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0844-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0845-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0844-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0846-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0845-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0846-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0845-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0847-Add-GameEvent-tags.patch b/patches/server/0846-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0847-Add-GameEvent-tags.patch
rename to patches/server/0846-Add-GameEvent-tags.patch
diff --git a/patches/server/0848-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0847-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0848-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0847-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0849-Replace-ticket-level-propagator.patch b/patches/server/0848-Replace-ticket-level-propagator.patch
similarity index 100%
rename from patches/server/0849-Replace-ticket-level-propagator.patch
rename to patches/server/0848-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0850-Furnace-RecipesUsed-API.patch b/patches/server/0849-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0850-Furnace-RecipesUsed-API.patch
rename to patches/server/0849-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0851-Configurable-sculk-sensor-listener-range.patch b/patches/server/0850-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0851-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0850-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0852-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0851-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0852-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0851-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0853-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0852-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0853-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0852-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0854-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0853-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0854-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0853-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0855-Fix-Entity-Position-Desync.patch b/patches/server/0854-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0855-Fix-Entity-Position-Desync.patch
rename to patches/server/0854-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0856-Custom-Potion-Mixes.patch b/patches/server/0855-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0856-Custom-Potion-Mixes.patch
rename to patches/server/0855-Custom-Potion-Mixes.patch
diff --git a/patches/server/0857-Replace-player-chunk-loader-system.patch b/patches/server/0856-Replace-player-chunk-loader-system.patch
similarity index 100%
rename from patches/server/0857-Replace-player-chunk-loader-system.patch
rename to patches/server/0856-Replace-player-chunk-loader-system.patch
diff --git a/patches/server/0858-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0857-Fix-Fluid-tags-isTagged-method.patch
similarity index 100%
rename from patches/server/0858-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0857-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0859-Fix-World-locateNearestStructure.patch b/patches/server/0858-Fix-World-locateNearestStructure.patch
similarity index 100%
rename from patches/server/0859-Fix-World-locateNearestStructure.patch
rename to patches/server/0858-Fix-World-locateNearestStructure.patch
diff --git a/patches/server/0860-Force-close-world-loading-screen.patch b/patches/server/0859-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0860-Force-close-world-loading-screen.patch
rename to patches/server/0859-Force-close-world-loading-screen.patch
diff --git a/patches/server/0861-Fix-falling-block-spawn-methods.patch b/patches/server/0860-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0861-Fix-falling-block-spawn-methods.patch
rename to patches/server/0860-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0862-Expose-furnace-minecart-push-values.patch b/patches/server/0861-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0862-Expose-furnace-minecart-push-values.patch
rename to patches/server/0861-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0863-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0862-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0863-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0862-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0864-Fix-save-problems-on-shutdown.patch b/patches/server/0863-Fix-save-problems-on-shutdown.patch
similarity index 100%
rename from patches/server/0864-Fix-save-problems-on-shutdown.patch
rename to patches/server/0863-Fix-save-problems-on-shutdown.patch
diff --git a/patches/server/0865-More-Projectile-API.patch b/patches/server/0864-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0865-More-Projectile-API.patch
rename to patches/server/0864-More-Projectile-API.patch
diff --git a/patches/server/0866-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0865-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0866-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0865-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0867-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0866-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0867-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0866-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0868-Implement-getComputedBiome-API.patch b/patches/server/0867-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0868-Implement-getComputedBiome-API.patch
rename to patches/server/0867-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0869-Make-some-itemstacks-nonnull.patch b/patches/server/0868-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0869-Make-some-itemstacks-nonnull.patch
rename to patches/server/0868-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0870-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0869-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
similarity index 100%
rename from patches/server/0870-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
rename to patches/server/0869-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0871-Implement-enchantWithLevels-API.patch b/patches/server/0870-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0871-Implement-enchantWithLevels-API.patch
rename to patches/server/0870-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0872-Fix-saving-in-unloadWorld.patch b/patches/server/0871-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0872-Fix-saving-in-unloadWorld.patch
rename to patches/server/0871-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0873-Buffer-OOB-setBlock-calls.patch b/patches/server/0872-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0873-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0872-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0874-Add-TameableDeathMessageEvent.patch b/patches/server/0873-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0874-Add-TameableDeathMessageEvent.patch
rename to patches/server/0873-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0875-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/server/0874-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
similarity index 100%
rename from patches/server/0875-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
rename to patches/server/0874-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
diff --git a/patches/server/0876-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0875-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0876-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0875-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0877-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0876-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0877-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0876-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0878-Guard-against-invalid-entity-positions.patch b/patches/server/0877-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0878-Guard-against-invalid-entity-positions.patch
rename to patches/server/0877-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0879-cache-resource-keys.patch b/patches/server/0878-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0879-cache-resource-keys.patch
rename to patches/server/0878-cache-resource-keys.patch
diff --git a/patches/server/0880-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0879-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0880-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0879-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0881-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0880-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0881-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0880-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0882-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0881-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0882-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0881-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0883-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0882-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0883-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0882-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0884-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0883-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0884-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0883-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0885-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0884-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0885-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0884-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0886-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0885-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0886-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0885-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0887-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0886-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0887-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0886-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0888-WorldCreator-keepSpawnLoaded.patch b/patches/server/0887-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0888-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0887-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0889-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0888-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0889-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0888-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0890-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0889-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0890-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0889-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0891-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0890-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0891-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0890-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0892-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0891-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0892-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0891-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0893-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0892-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0893-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0892-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0894-Add-PlayerStopUsingItemEvent.patch b/patches/server/0893-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0894-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0893-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0895-FallingBlock-auto-expire-setting.patch b/patches/server/0894-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0895-FallingBlock-auto-expire-setting.patch
rename to patches/server/0894-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0896-Don-t-tick-markers.patch b/patches/server/0895-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0896-Don-t-tick-markers.patch
rename to patches/server/0895-Don-t-tick-markers.patch
diff --git a/patches/server/0897-Do-not-accept-invalid-client-settings.patch b/patches/server/0896-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0897-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0896-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0898-Add-support-for-Proxy-Protocol.patch b/patches/server/0897-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0898-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0897-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0899-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0898-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0899-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0898-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0900-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0899-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0900-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0899-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0901-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0900-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0901-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0900-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0902-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0901-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0902-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0901-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0903-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0902-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0903-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0902-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0904-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0903-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0904-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0903-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0905-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0904-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0905-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0904-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0906-Dont-resent-entity-on-art-update.patch b/patches/server/0905-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0906-Dont-resent-entity-on-art-update.patch
rename to patches/server/0905-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0907-Untrash-chat-handling.patch b/patches/server/0906-Untrash-chat-handling.patch
similarity index 100%
rename from patches/server/0907-Untrash-chat-handling.patch
rename to patches/server/0906-Untrash-chat-handling.patch
diff --git a/patches/server/0908-Add-missing-spawn-eggs.patch b/patches/server/0907-Add-missing-spawn-eggs.patch
similarity index 100%
rename from patches/server/0908-Add-missing-spawn-eggs.patch
rename to patches/server/0907-Add-missing-spawn-eggs.patch
diff --git a/patches/server/0909-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0908-Remove-invalid-signature-login-stacktrace.patch
similarity index 100%
rename from patches/server/0909-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0908-Remove-invalid-signature-login-stacktrace.patch