diff --git a/patches/removed/1.19/0529-Significantly-improve-performance-of-the-end-generat.patch b/patches/removed/1.19/0529-Significantly-improve-performance-of-the-end-generat.patch
deleted file mode 100644
index a81147bb1..000000000
--- a/patches/removed/1.19/0529-Significantly-improve-performance-of-the-end-generat.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SuperCoder7979 <25208576+SuperCoder7979@users.noreply.github.com>
-Date: Tue, 3 Nov 2020 23:48:05 -0600
-Subject: [PATCH] Significantly improve performance of the end generation
-
-This patch implements a noise cache for the end which significantly reduces the computation time of generation. This results in about a 3x improvement.
-
-Original code by SuperCoder7979 and Gegy in Lithium, licensed under LGPL-3.0 (Source: https://github.com/jellysquid3/lithium-fabric)
-
-Co-authored-by: Gegy <gegy1000@gmail.com>
-Co-authored-by: Dylan Xaldin <Puremin0rez515@gmail.com>
-Co-authored-by: pop4959 <pop4959@gmail.com>
-
-1.19: Not compatible. Was removed from lithium a while ago I think (see https://github.com/CaffeineMC/lithium-fabric/commit/94cffd161193bf51b7986379bb77b3f97e7c25d2) -MM
-
-diff --git a/src/main/java/net/minecraft/world/level/biome/TheEndBiomeSource.java b/src/main/java/net/minecraft/world/level/biome/TheEndBiomeSource.java
-index 3f9127f93c9720c89b578d36a1bcdb89fc01222a..9004d9d7dcb1466047da62d0a6d01e7b4ac6a216 100644
---- a/src/main/java/net/minecraft/world/level/biome/TheEndBiomeSource.java
-+++ b/src/main/java/net/minecraft/world/level/biome/TheEndBiomeSource.java
-@@ -29,6 +29,16 @@ public class TheEndBiomeSource extends BiomeSource {
-     private final Holder<Biome> midlands;
-     private final Holder<Biome> islands;
-     private final Holder<Biome> barrens;
-+    // Paper start
-+    private static final class NoiseCache {
-+        public long[] keys = new long[8192];
-+        public float[] values = new float[8192];
-+        public NoiseCache() {
-+            java.util.Arrays.fill(keys, Long.MIN_VALUE);
-+        }
-+    }
-+    private static final ThreadLocal<java.util.Map<SimplexNoise, NoiseCache>> noiseCache = ThreadLocal.withInitial(java.util.WeakHashMap::new);
-+    // Paper end
- 
-     public TheEndBiomeSource(Registry<Biome> biomeRegistry, long seed) {
-         this(seed, biomeRegistry.getOrCreateHolder(Biomes.THE_END), biomeRegistry.getOrCreateHolder(Biomes.END_HIGHLANDS), biomeRegistry.getOrCreateHolder(Biomes.END_MIDLANDS), biomeRegistry.getOrCreateHolder(Biomes.SMALL_END_ISLANDS), biomeRegistry.getOrCreateHolder(Biomes.END_BARRENS));
-@@ -87,12 +97,26 @@ public class TheEndBiomeSource extends BiomeSource {
-         float f = 100.0F - Mth.sqrt((long) i * (long) i + (long) j * (long) j) * 8.0F; // Paper - cast ints to long to avoid integer overflow
-         f = Mth.clamp(f, -100.0F, 80.0F);
- 
-+        NoiseCache cache = noiseCache.get().computeIfAbsent(simplexNoise, noiseKey -> new NoiseCache()); // Paper
-         for(int o = -12; o <= 12; ++o) {
-             for(int p = -12; p <= 12; ++p) {
-                 long q = (long)(k + o);
-                 long r = (long)(l + p);
--                if (q * q + r * r > 4096L && simplexNoise.getValue((double)q, (double)r) < (double)-0.9F) {
--                    float g = (Mth.abs((float)q) * 3439.0F + Mth.abs((float)r) * 147.0F) % 13.0F + 9.0F;
-+                // Paper start - Significantly improve end generation performance by using a noise cache
-+                long key = net.minecraft.world.level.ChunkPos.asLong((int) q, (int) r);
-+                int index = (int) it.unimi.dsi.fastutil.HashCommon.mix(key) & 8191;
-+                float g = Float.MIN_VALUE;
-+                if (cache.keys[index] == key) {
-+                    g = cache.values[index];
-+                } else {
-+                    if (q * q + r * r > 4096L && simplexNoise.getValue((double)q, (double)r) < (double)-0.9F) {
-+                        g = (Mth.abs((float) q) * 3439.0F + Mth.abs((float) r) * 147.0F) % 13.0F + 9.0F;
-+                    }
-+                    cache.keys[index] = key;
-+                    cache.values[index] = g;
-+                }
-+                if (g != Float.MIN_VALUE) {
-+                    // Paper end
-                     float h = (float)(m - o * 2);
-                     float s = (float)(n - p * 2);
-                     float t = 100.0F - Mth.sqrt(h * h + s * s) * g;
diff --git a/patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch
new file mode 100644
index 000000000..8986e82f7
--- /dev/null
+++ b/patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch
@@ -0,0 +1,63 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: SuperCoder7979 <25208576+SuperCoder7979@users.noreply.github.com>
+Date: Tue, 3 Nov 2020 23:48:05 -0600
+Subject: [PATCH] Significantly improve performance of the end generation
+
+This patch implements a noise cache for the end which significantly reduces the computation time of generation. This results in about a 3x improvement.
+
+Original code by SuperCoder7979 and Gegy in Lithium, licensed under LGPL-3.0 (Source: https://github.com/jellysquid3/lithium-fabric)
+
+Co-authored-by: Gegy <gegy1000@gmail.com>
+Co-authored-by: Dylan Xaldin <Puremin0rez515@gmail.com>
+Co-authored-by: pop4959 <pop4959@gmail.com>
+
+diff --git a/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java b/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java
+index 6825feea42667a0f14c4c730e5f1ac970c654c56..1d00c019eb976de22be6e5e1f3632ca0c00d77ea 100644
+--- a/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java
++++ b/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java
+@@ -489,6 +489,16 @@ public final class DensityFunctions {
+         public static final KeyDispatchDataCodec<DensityFunctions.EndIslandDensityFunction> CODEC = KeyDispatchDataCodec.of(MapCodec.unit(new DensityFunctions.EndIslandDensityFunction(0L)));
+         private static final float ISLAND_THRESHOLD = -0.9F;
+         private final SimplexNoise islandNoise;
++        // Paper start
++        private static final class NoiseCache {
++            public long[] keys = new long[8192];
++            public float[] values = new float[8192];
++            public NoiseCache() {
++                java.util.Arrays.fill(keys, Long.MIN_VALUE);
++            }
++        }
++        private static final ThreadLocal<java.util.Map<SimplexNoise, NoiseCache>> noiseCache = ThreadLocal.withInitial(java.util.WeakHashMap::new);
++        // Paper end
+ 
+         public EndIslandDensityFunction(long seed) {
+             RandomSource randomSource = new LegacyRandomSource(seed);
+@@ -504,12 +514,26 @@ public final class DensityFunctions {
+             float f = 100.0F - Mth.sqrt((long) i * (long) i + (long) j * (long) j) * 8.0F; // Paper - cast ints to long to avoid integer overflow
+             f = Mth.clamp(f, -100.0F, 80.0F);
+ 
++            NoiseCache cache = noiseCache.get().computeIfAbsent(simplexNoise, noiseKey -> new NoiseCache()); // Paper
+             for(int o = -12; o <= 12; ++o) {
+                 for(int p = -12; p <= 12; ++p) {
+                     long q = (long)(k + o);
+                     long r = (long)(l + p);
+-                    if (q * q + r * r > 4096L && simplexNoise.getValue((double)q, (double)r) < (double)-0.9F) {
+-                        float g = (Mth.abs((float)q) * 3439.0F + Mth.abs((float)r) * 147.0F) % 13.0F + 9.0F;
++                    // Paper start - Significantly improve end generation performance by using a noise cache
++                    long key = net.minecraft.world.level.ChunkPos.asLong((int) q, (int) r);
++                    int index = (int) it.unimi.dsi.fastutil.HashCommon.mix(key) & 8191;
++                    float g = Float.MIN_VALUE;
++                    if (cache.keys[index] == key) {
++                        g = cache.values[index];
++                    } else {
++                        if (q * q + r * r > 4096L && simplexNoise.getValue((double)q, (double)r) < (double)-0.9F) {
++                            g = (Mth.abs((float) q) * 3439.0F + Mth.abs((float) r) * 147.0F) % 13.0F + 9.0F;
++                        }
++                        cache.keys[index] = key;
++                        cache.values[index] = g;
++                    }
++                    if (g != Float.MIN_VALUE) {
++                        // Paper end
+                         float h = (float)(m - o * 2);
+                         float s = (float)(n - p * 2);
+                         float t = 100.0F - Mth.sqrt(h * h + s * s) * g;
diff --git a/patches/server/0529-More-lightning-API.patch b/patches/server/0530-More-lightning-API.patch
similarity index 100%
rename from patches/server/0529-More-lightning-API.patch
rename to patches/server/0530-More-lightning-API.patch
diff --git a/patches/server/0530-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0530-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0531-Added-missing-default-perms-for-commands.patch b/patches/server/0532-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0531-Added-missing-default-perms-for-commands.patch
rename to patches/server/0532-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0532-Add-PlayerShearBlockEvent.patch b/patches/server/0533-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0532-Add-PlayerShearBlockEvent.patch
rename to patches/server/0533-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0533-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0534-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0533-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0534-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0534-Limit-recipe-packets.patch b/patches/server/0535-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0534-Limit-recipe-packets.patch
rename to patches/server/0535-Limit-recipe-packets.patch
diff --git a/patches/server/0535-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0536-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0535-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0536-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0536-Player-Chunk-Load-Unload-Events.patch b/patches/server/0537-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0536-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0537-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0537-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0538-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0537-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0538-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0538-Expose-LivingEntity-hurt-direction.patch b/patches/server/0539-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0538-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0539-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0539-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 91%
rename from patches/server/0539-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 39a249774..fb5ec2223 100644
--- a/patches/server/0539-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 396a66ccd90f8b5da42b585b50d2f0d5a80697b7..04923ca78b5866162612c5bc82e03c4ccd024c7f 100644
+index b0aec2a6174048f38dd85360a4dda883ecff7111..46189c02e94af8520bf7e226f3924ba8952e72d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -263,6 +263,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0540-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0540-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0541-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0541-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0542-Implement-TargetHitEvent.patch b/patches/server/0543-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0542-Implement-TargetHitEvent.patch
rename to patches/server/0543-Implement-TargetHitEvent.patch
diff --git a/patches/server/0543-Additional-Block-Material-API-s.patch b/patches/server/0544-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0543-Additional-Block-Material-API-s.patch
rename to patches/server/0544-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0544-Fix-harming-potion-dupe.patch b/patches/server/0545-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0544-Fix-harming-potion-dupe.patch
rename to patches/server/0545-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0545-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0545-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0546-Cache-burn-durations.patch b/patches/server/0547-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0546-Cache-burn-durations.patch
rename to patches/server/0547-Cache-burn-durations.patch
diff --git a/patches/server/0547-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0547-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0548-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0549-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0548-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0549-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0549-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0550-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0549-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0550-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0550-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0550-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0551-Zombie-API-breaking-doors.patch b/patches/server/0552-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0551-Zombie-API-breaking-doors.patch
rename to patches/server/0552-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0552-Fix-nerfed-slime-when-splitting.patch b/patches/server/0553-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0552-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0553-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0553-Add-EntityLoadCrossbowEvent.patch b/patches/server/0554-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0553-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0554-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0554-Guardian-beam-workaround.patch b/patches/server/0555-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0554-Guardian-beam-workaround.patch
rename to patches/server/0555-Guardian-beam-workaround.patch
diff --git a/patches/server/0555-Added-WorldGameRuleChangeEvent.patch b/patches/server/0556-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0555-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0556-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0556-Added-ServerResourcesReloadedEvent.patch b/patches/server/0557-Added-ServerResourcesReloadedEvent.patch
similarity index 97%
rename from patches/server/0556-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0557-Added-ServerResourcesReloadedEvent.patch
index 7a9691f12..e746f414f 100644
--- a/patches/server/0556-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0557-Added-ServerResourcesReloadedEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 377c0011cd5c9d51360ff78e314d82259482ae35..4e2b59449f0916927fb4426a0e87b85ca17cbfcd 100644
+index 0060211b3d85c07b44be3d3a534dcb8e35547d78..8460437b9210c8ae73795c65596ec35b491b18df 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1966,7 +1966,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0557-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0557-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0558-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0559-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0558-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0559-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0559-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0560-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0559-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0560-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0560-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0561-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0560-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0561-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0561-Configurable-door-breaking-difficulty.patch b/patches/server/0562-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0561-Configurable-door-breaking-difficulty.patch
rename to patches/server/0562-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0562-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0563-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0562-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0563-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0563-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch
similarity index 97%
rename from patches/server/0563-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch
index 40da330f0..cb48ca350 100644
--- a/patches/server/0563-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch
@@ -18,7 +18,7 @@ index 32c78828b0c85949832dc25843c881b8eecc63d6..06e7a8b8227260c002a88119544b99a1
          this.interactResult = event.useItemInHand() == Event.Result.DENY;
          this.interactPosition = blockposition.immutable();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 99ce890f6014b66f7fd699cf72089fd3224fe30b..dadbb7d5295eea5097a2563775ae86b8a14d92f8 100644
+index f89228c0c38c4acc299248e7d9639442eedca08b..a45ed570a7bf1becbc91c97c3890e99c0e5ebc0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -56,7 +56,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
diff --git a/patches/server/0564-Remove-stale-POIs.patch b/patches/server/0565-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0564-Remove-stale-POIs.patch
rename to patches/server/0565-Remove-stale-POIs.patch
diff --git a/patches/server/0565-Fix-villager-boat-exploit.patch b/patches/server/0566-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0565-Fix-villager-boat-exploit.patch
rename to patches/server/0566-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0566-Add-sendOpLevel-API.patch b/patches/server/0567-Add-sendOpLevel-API.patch
similarity index 95%
rename from patches/server/0566-Add-sendOpLevel-API.patch
rename to patches/server/0567-Add-sendOpLevel-API.patch
index ffbc6cda6..a71377441 100644
--- a/patches/server/0566-Add-sendOpLevel-API.patch
+++ b/patches/server/0567-Add-sendOpLevel-API.patch
@@ -32,7 +32,7 @@ index 6c7105af36339514db02800e651cd0948d48bdaf..42b2f5c61e2bd07c3c86d889949c5f24
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 772c7c34df1938efb4f97ef21ba39d75a5b8a1a5..482a6385d6d8072e2724054b91ea0347a648f8bc 100644
+index 23a92393036fea7631d7610b12d4e72fa6657203..fd6f948adb975f09b07ad7692c6a716616600ccc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -606,6 +606,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0567-Add-PaperRegistry.patch b/patches/server/0568-Add-PaperRegistry.patch
similarity index 98%
rename from patches/server/0567-Add-PaperRegistry.patch
rename to patches/server/0568-Add-PaperRegistry.patch
index db485181c..05b300bd2 100644
--- a/patches/server/0567-Add-PaperRegistry.patch
+++ b/patches/server/0568-Add-PaperRegistry.patch
@@ -193,7 +193,7 @@ index 0000000000000000000000000000000000000000..6f39e343147803e15e7681c993b8797a
 +public record RegistryKey<API extends Keyed, MINECRAFT>(Class<API> apiClass, ResourceKey<? extends Registry<MINECRAFT>> resourceKey) {
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4e2b59449f0916927fb4426a0e87b85ca17cbfcd..2dbd4718b98f90842600ae4cde927b09d5fc738b 100644
+index 8460437b9210c8ae73795c65596ec35b491b18df..18f050a80f9928bae3c1a0288f152907090644b7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1998,6 +1998,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -221,7 +221,7 @@ index 4192a6eff940bfe7823f100d4156f5c4d82d994c..e4855c7652b6904b402e38144664266d
  
      /**
 diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-index b58962026c739ed06fbe0f702cb2877fbfa7b2e4..b135f36a3b75f150781bd1e2d5852f18862a6a3a 100644
+index 7de91b0b669664be3406b77a453d517604170404..747d150996ba56416e80293f616d8773878cceb5 100644
 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
 +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
 @@ -38,6 +38,15 @@ public abstract class AbstractTestingBase {
diff --git a/patches/server/0568-Add-StructuresLocateEvent.patch b/patches/server/0569-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0568-Add-StructuresLocateEvent.patch
rename to patches/server/0569-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0569-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0570-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0569-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0570-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0570-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0570-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0571-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0572-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0571-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0572-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0572-Make-schedule-command-per-world.patch b/patches/server/0573-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0572-Make-schedule-command-per-world.patch
rename to patches/server/0573-Make-schedule-command-per-world.patch
diff --git a/patches/server/0573-Configurable-max-leash-distance.patch b/patches/server/0574-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0573-Configurable-max-leash-distance.patch
rename to patches/server/0574-Configurable-max-leash-distance.patch
diff --git a/patches/server/0574-Implement-BlockPreDispenseEvent.patch b/patches/server/0575-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0574-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0575-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0575-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0575-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0576-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0576-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0577-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0578-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0577-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0578-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0578-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0578-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0579-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0580-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0579-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0580-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0580-add-DragonEggFormEvent.patch b/patches/server/0581-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0580-add-DragonEggFormEvent.patch
rename to patches/server/0581-add-DragonEggFormEvent.patch
diff --git a/patches/server/0581-EntityMoveEvent.patch b/patches/server/0582-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0581-EntityMoveEvent.patch
rename to patches/server/0582-EntityMoveEvent.patch
diff --git a/patches/server/0582-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0582-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0583-Inline-shift-direction-fields.patch b/patches/server/0584-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0583-Inline-shift-direction-fields.patch
rename to patches/server/0584-Inline-shift-direction-fields.patch
diff --git a/patches/server/0584-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 95%
rename from patches/server/0584-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch
index 3d7a598a0..f3c5cbca9 100644
--- a/patches/server/0584-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ad0a12f5d1b2179b31a307c0c5ca8478fbf43fc1..090c0cd38877ec06faa1e0ac43389a68c7153dac 100644
+index 7893c10295abcd6ab2e3c4458c31f0b8914ba4c3..7570d5254b5807e967e7ab2560f091a9d601a876 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -396,13 +396,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0585-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0585-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0586-living-entity-allow-attribute-registration.patch b/patches/server/0587-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0586-living-entity-allow-attribute-registration.patch
rename to patches/server/0587-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0587-fix-dead-slime-setSize-invincibility.patch b/patches/server/0588-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0587-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0588-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0588-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0588-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0589-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0590-Add-support-for-hex-color-codes-in-console.patch
similarity index 99%
rename from patches/server/0589-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0590-Add-support-for-hex-color-codes-in-console.patch
index 15c5829fe..a54892a9e 100644
--- a/patches/server/0589-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/server/0590-Add-support-for-hex-color-codes-in-console.patch
@@ -255,7 +255,7 @@ index 0000000000000000000000000000000000000000..f39ae450e316255d315aeb362bf967ea
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b82e510939281efa3f32d21e8080adcf232285fc..3e496aa054ee707abcfd48e31dc0f62ae3371e9d 100644
+index 49f481d34eec97c2bd4f0780e97ce2d41ed04b34..57924d8f2ddac1e7c0c151c4813a2a5ca17e58b8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1670,7 +1670,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0590-Expose-Tracked-Players.patch b/patches/server/0591-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0590-Expose-Tracked-Players.patch
rename to patches/server/0591-Expose-Tracked-Players.patch
diff --git a/patches/server/0591-Remove-streams-from-SensorNearest.patch b/patches/server/0592-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0591-Remove-streams-from-SensorNearest.patch
rename to patches/server/0592-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0592-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0593-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0592-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0593-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0593-Improve-ServerGUI.patch b/patches/server/0594-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0593-Improve-ServerGUI.patch
rename to patches/server/0594-Improve-ServerGUI.patch
diff --git a/patches/server/0594-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0594-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0595-fix-converting-txt-to-json-file.patch b/patches/server/0596-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0595-fix-converting-txt-to-json-file.patch
rename to patches/server/0596-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0596-Add-worldborder-events.patch b/patches/server/0597-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0596-Add-worldborder-events.patch
rename to patches/server/0597-Add-worldborder-events.patch
diff --git a/patches/server/0597-added-PlayerNameEntityEvent.patch b/patches/server/0598-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0597-added-PlayerNameEntityEvent.patch
rename to patches/server/0598-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0598-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0599-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0598-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0599-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0599-Add-recipe-to-cook-events.patch b/patches/server/0600-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0599-Add-recipe-to-cook-events.patch
rename to patches/server/0600-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0600-Add-Block-isValidTool.patch b/patches/server/0601-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0600-Add-Block-isValidTool.patch
rename to patches/server/0601-Add-Block-isValidTool.patch
diff --git a/patches/server/0601-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0602-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0601-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0602-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0602-Expand-world-key-API.patch b/patches/server/0603-Expand-world-key-API.patch
similarity index 97%
rename from patches/server/0602-Expand-world-key-API.patch
rename to patches/server/0603-Expand-world-key-API.patch
index f1aa9ad50..261a15292 100644
--- a/patches/server/0602-Expand-world-key-API.patch
+++ b/patches/server/0603-Expand-world-key-API.patch
@@ -20,7 +20,7 @@ index ee5e59c37301d9a806e2f696d52d9d217b232833..bb5d22125b6cd4e60d2b7e2e00af158c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 19aa748a38ab2d53cfe8a5f2ce95a285ae5fc957..288d6625c30e7d36c6c4ce372bccf3d42536be35 100644
+index 41eaca0ef3d5d309fab7e7dddff0310d24c88966..5a84f867bd3b422706d03b75800adb9d7c445fc9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1132,9 +1132,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0603-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0604-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0603-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0604-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0604-Item-Rarity-API.patch b/patches/server/0605-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0604-Item-Rarity-API.patch
rename to patches/server/0605-Item-Rarity-API.patch
diff --git a/patches/server/0605-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0605-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0606-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0607-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0606-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0607-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0607-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0607-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0608-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0609-forced-whitelist-use-configurable-kick-message.patch
similarity index 92%
rename from patches/server/0608-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0609-forced-whitelist-use-configurable-kick-message.patch
index 54a1281cd..68e2f5b09 100644
--- a/patches/server/0608-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0609-forced-whitelist-use-configurable-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3e496aa054ee707abcfd48e31dc0f62ae3371e9d..855a4a27cfa706432da6b75e1d80d1214917dab6 100644
+index 57924d8f2ddac1e7c0c151c4813a2a5ca17e58b8..ff2a9dbacffdb1e4b790aedd61b82c7adf0831aa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2080,7 +2080,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0609-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0609-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0610-Entity-load-save-limit-per-chunk.patch b/patches/server/0611-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0610-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0611-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0611-Expose-protocol-version.patch b/patches/server/0612-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0611-Expose-protocol-version.patch
rename to patches/server/0612-Expose-protocol-version.patch
diff --git a/patches/server/0612-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0613-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from patches/server/0612-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0613-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0613-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0614-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0613-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0614-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0614-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0614-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0615-Add-bypass-host-check.patch b/patches/server/0616-Add-bypass-host-check.patch
similarity index 95%
rename from patches/server/0615-Add-bypass-host-check.patch
rename to patches/server/0616-Add-bypass-host-check.patch
index 8dc2084e8..85854dc71 100644
--- a/patches/server/0615-Add-bypass-host-check.patch
+++ b/patches/server/0616-Add-bypass-host-check.patch
@@ -8,7 +8,7 @@ Paper.bypassHostCheck
 Seriously, fix your firewalls. -.-
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 9ece2ceac6c5095469b080f08bf7af8f7b31f003..142737266a2afcbbd70556615f56730d44e862f9 100644
+index 750fef0f5b908b776a7306e54653eba497b7c50b..53833fdd748098b662d4420a254401c0d3982e56 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -29,6 +29,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0616-Set-area-affect-cloud-rotation.patch b/patches/server/0617-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0616-Set-area-affect-cloud-rotation.patch
rename to patches/server/0617-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0617-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0617-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0618-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0619-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0618-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0619-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0619-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0620-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0619-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0620-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0620-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0621-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0620-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0621-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0621-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0622-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0621-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0622-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0623-Added-PlayerDeepSleepEvent.patch b/patches/server/0624-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0623-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0624-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0624-More-World-API.patch b/patches/server/0625-More-World-API.patch
similarity index 100%
rename from patches/server/0624-More-World-API.patch
rename to patches/server/0625-More-World-API.patch
diff --git a/patches/server/0625-Added-PlayerBedFailEnterEvent.patch b/patches/server/0626-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0625-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0626-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0626-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0627-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0626-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0627-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0628-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0629-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0628-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0629-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0629-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0629-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0630-Add-Channel-initialization-listeners.patch b/patches/server/0631-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0630-Add-Channel-initialization-listeners.patch
rename to patches/server/0631-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0631-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0632-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0631-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0632-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0632-Add-more-WanderingTrader-API.patch b/patches/server/0633-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0632-Add-more-WanderingTrader-API.patch
rename to patches/server/0633-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0633-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0634-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0633-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0634-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0634-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0634-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0636-Inventory-close.patch b/patches/server/0637-Inventory-close.patch
similarity index 100%
rename from patches/server/0636-Inventory-close.patch
rename to patches/server/0637-Inventory-close.patch
diff --git a/patches/server/0637-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/server/0637-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0638-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0638-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0639-Fix-CraftPotionBrewer-cache.patch b/patches/server/0640-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0639-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0640-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0640-Add-basic-Datapack-API.patch b/patches/server/0641-Add-basic-Datapack-API.patch
similarity index 98%
rename from patches/server/0640-Add-basic-Datapack-API.patch
rename to patches/server/0641-Add-basic-Datapack-API.patch
index 1422f2683..8b9ec85a9 100644
--- a/patches/server/0640-Add-basic-Datapack-API.patch
+++ b/patches/server/0641-Add-basic-Datapack-API.patch
@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 648d37ecde4b890cfb93ca94b2b9f8fe08283981..50fb92c87fbaabdbac1e08979132619d71b8b0c6 100644
+index 5a84f867bd3b422706d03b75800adb9d7c445fc9..2e1dd08b7bd9836c8ff590db43008ec83a0fd51f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -276,6 +276,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0641-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0642-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0641-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0642-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0643-ItemStack-repair-check-API.patch b/patches/server/0644-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0643-ItemStack-repair-check-API.patch
rename to patches/server/0644-ItemStack-repair-check-API.patch
diff --git a/patches/server/0644-More-Enchantment-API.patch b/patches/server/0645-More-Enchantment-API.patch
similarity index 98%
rename from patches/server/0644-More-Enchantment-API.patch
rename to patches/server/0645-More-Enchantment-API.patch
index 351f9b0a4..9068048df 100644
--- a/patches/server/0644-More-Enchantment-API.patch
+++ b/patches/server/0645-More-Enchantment-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More Enchantment API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-index 9bc659a7ab2030e851c85ca511fbba51998563bf..d94ca202033edff679d9471cb33a314735f57be7 100644
+index 31a22f26070059e5379730c1940ff1c5fb109be1..873185fd4d4c994130f2e7c271b3e03cefb2278c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
 +++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
 @@ -71,7 +71,7 @@ public class CraftEnchantment extends Enchantment {
diff --git a/patches/server/0645-Move-range-check-for-block-placing-up.patch b/patches/server/0646-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0645-Move-range-check-for-block-placing-up.patch
rename to patches/server/0646-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0646-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0647-Fix-and-optimise-world-force-upgrading.patch
similarity index 98%
rename from patches/server/0646-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0647-Fix-and-optimise-world-force-upgrading.patch
index af0546dee..50ca9d48d 100644
--- a/patches/server/0646-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0647-Fix-and-optimise-world-force-upgrading.patch
@@ -272,7 +272,7 @@ index ce4aed84d751a48dcd2a8409190db4a22d78f77b..0a843e0afbcb1af8e2641515eb244b79
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 855a4a27cfa706432da6b75e1d80d1214917dab6..86609f740b6bf4890c63d8de15f366032eb024ff 100644
+index ff2a9dbacffdb1e4b790aedd61b82c7adf0831aa..e232039b939ea226348405836dece6e5ac926aa8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -542,11 +542,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -303,7 +303,7 @@ index 855a4a27cfa706432da6b75e1d80d1214917dab6..86609f740b6bf4890c63d8de15f36603
  
              if (dimensionKey == LevelStem.OVERWORLD) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 690efb366042604008a31ad6e9624b6d05e5b979..1ebba751e47c24e5c71a057e79cf733ed91a0a1b 100644
+index bd04c33ae31bfaed508ac5d39db7cb1fd5cf2913..646e40b01a4df143802dc981a5594a17c37e5d10 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -183,6 +183,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -356,7 +356,7 @@ index a96a6af2bcec3134b7caa32299bd07af50e83b89..0d96d1c0b66c57c680759f3567ef1b0c
          return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3752cd9e3ac1b1a82b79006ca09a873c9adbd7a4..2d14b47ba9687ccad6e1eb7c83172a77e3f5172a 100644
+index 2e1dd08b7bd9836c8ff590db43008ec83a0fd51f..4c5228b4e2fc3bf817011391b18b39ac95666e71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1193,12 +1193,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0647-Add-Mob-lookAt-API.patch b/patches/server/0648-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0647-Add-Mob-lookAt-API.patch
rename to patches/server/0648-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0648-Add-Unix-domain-socket-support.patch b/patches/server/0649-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0648-Add-Unix-domain-socket-support.patch
rename to patches/server/0649-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0649-Add-EntityInsideBlockEvent.patch b/patches/server/0650-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0649-Add-EntityInsideBlockEvent.patch
rename to patches/server/0650-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0650-Attributes-API-for-item-defaults.patch b/patches/server/0651-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0650-Attributes-API-for-item-defaults.patch
rename to patches/server/0651-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0651-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0651-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0652-More-Lidded-Block-API.patch b/patches/server/0653-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0652-More-Lidded-Block-API.patch
rename to patches/server/0653-More-Lidded-Block-API.patch
diff --git a/patches/server/0653-Limit-item-frame-cursors-on-maps.patch b/patches/server/0654-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0653-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0654-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0654-Add-PlayerKickEvent-causes.patch b/patches/server/0655-Add-PlayerKickEvent-causes.patch
similarity index 99%
rename from patches/server/0654-Add-PlayerKickEvent-causes.patch
rename to patches/server/0655-Add-PlayerKickEvent-causes.patch
index 2dba28966..17f4a1249 100644
--- a/patches/server/0654-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0655-Add-PlayerKickEvent-causes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 86609f740b6bf4890c63d8de15f366032eb024ff..93631f0a59781b8310f7bf66c0ed4781b833ef79 100644
+index e232039b939ea226348405836dece6e5ac926aa8..b1a0f0b1bed05fbea5d21157317d08dd92ec78f0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2083,7 +2083,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0655-Add-PufferFishStateChangeEvent.patch b/patches/server/0656-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0655-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0656-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0656-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0656-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0657-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0657-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch
similarity index 94%
rename from patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch
index b628475ea..4b6a75bf8 100644
--- a/patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch
@@ -5,7 +5,7 @@ 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 296434a1659cd9ae3d582696336f75e3c156b8c4..0db5b0b05a9a213e28311a934b31bd32807eb2e0 100644
+index 22437b835c309956f263278db37737251e1503d5..7e927dec3e4e4fb65bf89a87cfa555045c58bb3a 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 {
diff --git a/patches/server/0659-Add-BellRevealRaiderEvent.patch b/patches/server/0660-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0659-Add-BellRevealRaiderEvent.patch
rename to patches/server/0660-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0660-Fix-invulnerable-end-crystals.patch b/patches/server/0661-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0660-Fix-invulnerable-end-crystals.patch
rename to patches/server/0661-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0661-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0662-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0661-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0662-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0662-Fix-dangerous-end-portal-logic.patch b/patches/server/0663-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0662-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0663-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0663-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0663-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0664-Make-item-validations-configurable.patch b/patches/server/0665-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0664-Make-item-validations-configurable.patch
rename to patches/server/0665-Make-item-validations-configurable.patch
diff --git a/patches/server/0665-Line-Of-Sight-Changes.patch b/patches/server/0666-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0665-Line-Of-Sight-Changes.patch
rename to patches/server/0666-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0666-add-per-world-spawn-limits.patch b/patches/server/0667-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0666-add-per-world-spawn-limits.patch
rename to patches/server/0667-add-per-world-spawn-limits.patch
diff --git a/patches/server/0667-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0667-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0668-Add-more-LimitedRegion-API.patch b/patches/server/0669-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0668-Add-more-LimitedRegion-API.patch
rename to patches/server/0669-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0669-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0669-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0670-Missing-Entity-Behavior-API.patch b/patches/server/0671-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0670-Missing-Entity-Behavior-API.patch
rename to patches/server/0671-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0671-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0671-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0672-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0672-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0673-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0673-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0674-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0674-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0675-Adds-PlayerArmSwingEvent.patch b/patches/server/0676-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0675-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0676-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0676-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/0676-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0677-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0677-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0678-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0679-Fix-incorrect-message-for-outdated-client.patch
similarity index 94%
rename from patches/server/0678-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0679-Fix-incorrect-message-for-outdated-client.patch
index 0e9401324..7f39718ca 100644
--- a/patches/server/0678-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0679-Fix-incorrect-message-for-outdated-client.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix incorrect message for outdated client
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index c7ac8193b7f4b29d0d85891de0eca67912c8811c..4c8cbac3ecc9b2a07367fdaf30ad8d7975410c86 100644
+index b02cbf6bcc57167a1373925f652950e0212dfa4f..08b21f5a7a07f44f8044f56991fb6723cd8f3eea 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -80,7 +80,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0679-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0680-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0679-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0680-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0680-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0680-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0681-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0682-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0681-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0682-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0682-Stinger-API.patch b/patches/server/0683-Stinger-API.patch
similarity index 100%
rename from patches/server/0682-Stinger-API.patch
rename to patches/server/0683-Stinger-API.patch
diff --git a/patches/server/0683-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0683-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0684-Add-System.out-err-catcher.patch b/patches/server/0685-Add-System.out-err-catcher.patch
similarity index 98%
rename from patches/server/0684-Add-System.out-err-catcher.patch
rename to patches/server/0685-Add-System.out-err-catcher.patch
index 68064c8de..3a428a174 100644
--- a/patches/server/0684-Add-System.out-err-catcher.patch
+++ b/patches/server/0685-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..76d0d00cd6742991e3f3ec827a75ee87
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2d14b47ba9687ccad6e1eb7c83172a77e3f5172a..df86cdc08d036c43000ce999647136270f97bc1b 100644
+index 4c5228b4e2fc3bf817011391b18b39ac95666e71..93f6e89de9c595d0ee492cd3fce99c9f3c5611ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -278,6 +278,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0685-Fix-test-not-bootstrapping.patch b/patches/server/0686-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0685-Fix-test-not-bootstrapping.patch
rename to patches/server/0686-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0686-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0686-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0687-Improve-boat-collision-performance.patch b/patches/server/0688-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0687-Improve-boat-collision-performance.patch
rename to patches/server/0688-Improve-boat-collision-performance.patch
diff --git a/patches/server/0688-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0688-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0689-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0689-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0690-Add-PlayerSetSpawnEvent.patch b/patches/server/0691-Add-PlayerSetSpawnEvent.patch
similarity index 99%
rename from patches/server/0690-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0691-Add-PlayerSetSpawnEvent.patch
index a741b5e52..3a125eb03 100644
--- a/patches/server/0690-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0691-Add-PlayerSetSpawnEvent.patch
@@ -129,7 +129,7 @@ index c3e49a781f838e6a46cb89744f3f1846de182275..c2f3d3a09327e7cb7d3167609eb3ce68
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 294b7c0ad1e0088307baecbab5ad33f897be5bcd..c27b099fb6636666612044935b598763df7c9251 100644
+index dc0c689864fb312ebdbc742561d73837229947cc..47c74e687610bba419d973461eb19c1ab5f09472 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1197,9 +1197,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0691-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0691-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0692-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0693-Optimize-entity-tracker-passenger-checks.patch
similarity index 90%
rename from patches/server/0692-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0693-Optimize-entity-tracker-passenger-checks.patch
index 0139c124d..2d8bc7884 100644
--- a/patches/server/0692-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0693-Optimize-entity-tracker-passenger-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize entity tracker passenger checks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 2c43304fd7a189f399f0e7757dbd593f3f462c37..98142edeb105e213545b47ba1addf2e6f799861c 100644
+index 7881176a900daa3306c691454f688c1f79b73475..f3b69a434988b8546ddf820117ff00848e0af983 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -71,7 +71,7 @@ public class ServerEntity {
diff --git a/patches/server/0693-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0694-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0693-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0694-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0694-Added-EntityDamageItemEvent.patch b/patches/server/0695-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0694-Added-EntityDamageItemEvent.patch
rename to patches/server/0695-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0695-Optimize-indirect-passenger-iteration.patch b/patches/server/0696-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0695-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0696-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0696-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/0696-Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 93%
rename from patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch
index bf8bc4b19..3a5424513 100644
--- a/patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable item frame map cursor update interval
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 98142edeb105e213545b47ba1addf2e6f799861c..4d5abfd4fdb0fb0d00840c8a6ef601e78b090888 100644
+index f3b69a434988b8546ddf820117ff00848e0af983..8988561facae5c41dc64929d742316b104ddbbfa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -100,7 +100,7 @@ public class ServerEntity {
diff --git a/patches/server/0698-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0699-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0698-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0699-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0699-Clear-bucket-NBT-after-dispense.patch b/patches/server/0700-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0699-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0700-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0700-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0700-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0701-Add-BlockBreakBlockEvent.patch b/patches/server/0702-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0701-Add-BlockBreakBlockEvent.patch
rename to patches/server/0702-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0702-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0702-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0703-More-CommandBlock-API.patch b/patches/server/0704-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0703-More-CommandBlock-API.patch
rename to patches/server/0704-More-CommandBlock-API.patch
diff --git a/patches/server/0704-Add-missing-team-sidebar-display-slots.patch b/patches/server/0705-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0704-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0705-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0705-Add-back-EntityPortalExitEvent.patch b/patches/server/0706-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0705-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0706-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0706-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0706-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0707-Get-entity-default-attributes.patch b/patches/server/0708-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0707-Get-entity-default-attributes.patch
rename to patches/server/0708-Get-entity-default-attributes.patch
diff --git a/patches/server/0708-Left-handed-API.patch b/patches/server/0709-Left-handed-API.patch
similarity index 100%
rename from patches/server/0708-Left-handed-API.patch
rename to patches/server/0709-Left-handed-API.patch
diff --git a/patches/server/0709-Add-advancement-display-API.patch b/patches/server/0710-Add-advancement-display-API.patch
similarity index 100%
rename from patches/server/0709-Add-advancement-display-API.patch
rename to patches/server/0710-Add-advancement-display-API.patch
diff --git a/patches/server/0710-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch
similarity index 100%
rename from patches/server/0710-Add-ItemFactory-getMonsterEgg-API.patch
rename to patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0711-Add-critical-damage-API.patch b/patches/server/0712-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0711-Add-critical-damage-API.patch
rename to patches/server/0712-Add-critical-damage-API.patch
diff --git a/patches/server/0712-Fix-issues-with-mob-conversion.patch b/patches/server/0713-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0712-Fix-issues-with-mob-conversion.patch
rename to patches/server/0713-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0713-Add-isCollidable-methods-to-various-places.patch b/patches/server/0714-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0713-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0714-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0714-Goat-ram-API.patch b/patches/server/0715-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0714-Goat-ram-API.patch
rename to patches/server/0715-Goat-ram-API.patch
diff --git a/patches/server/0715-Add-API-for-resetting-a-single-score.patch b/patches/server/0716-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0715-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0716-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0716-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0716-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0717-Vanilla-command-permission-fixes.patch b/patches/server/0718-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0717-Vanilla-command-permission-fixes.patch
rename to patches/server/0718-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0718-Make-CallbackExecutor-strict-again.patch b/patches/server/0719-Make-CallbackExecutor-strict-again.patch
similarity index 100%
rename from patches/server/0718-Make-CallbackExecutor-strict-again.patch
rename to patches/server/0719-Make-CallbackExecutor-strict-again.patch
diff --git a/patches/server/0719-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
similarity index 100%
rename from patches/server/0719-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
rename to patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0720-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0720-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0721-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch
similarity index 100%
rename from patches/server/0721-Correctly-handle-recursion-for-chunkholder-updates.patch
rename to patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0722-Fix-GameProfileCache-concurrency.patch b/patches/server/0723-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0722-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0723-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0723-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch
similarity index 100%
rename from patches/server/0723-Fix-chunks-refusing-to-unload-at-low-TPS.patch
rename to patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0724-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
similarity index 100%
rename from patches/server/0724-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
rename to patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
diff --git a/patches/server/0725-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch
similarity index 100%
rename from patches/server/0725-Do-not-allow-ticket-level-changes-when-updating-chun.patch
rename to patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0726-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch
similarity index 100%
rename from patches/server/0726-Do-not-submit-profile-lookups-to-worldgen-threads.patch
rename to patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0727-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0728-Log-when-the-async-catcher-is-tripped.patch
similarity index 100%
rename from patches/server/0727-Log-when-the-async-catcher-is-tripped.patch
rename to patches/server/0728-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 98%
rename from patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch
index ed9ad96a0..732e223de 100644
--- a/patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -10,7 +10,7 @@ Also has a hover text on each mob category listing what entity types are
 in said category
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 5ab7f0b6db9a25792aa99e90504ae75512bffc63..268374eccbccfc45257567f89de25ac83a6416fe 100644
+index 27c350c123b4349b8b401a06f204de46c88da7ac..008bb8896657892fcaf64e134684cc49e62f23f6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -3,6 +3,7 @@ package com.destroystokyo.paper;
@@ -293,7 +293,7 @@ index fa23e9c476d4edc6176d8b8a6cb13c52d2f66a87..4150e8cd7197eac53042d56f0a53a495
          // Paper start - add parameters and int ret type
          spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 78759009e78804efa6fcaf3804633698f3090990..64cd0cee5c9d68994fe45246cc46bd91c83c9599 100644
+index 93f6e89de9c595d0ee492cd3fce99c9f3c5611ec..de43370cb6a4f2e8d32a8c35478af27dd9f909a4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2130,6 +2130,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
similarity index 100%
rename from patches/server/0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
rename to patches/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/0730-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0731-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0730-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0731-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0731-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0732-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0731-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0732-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0732-Optimise-general-POI-access.patch b/patches/server/0733-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0732-Optimise-general-POI-access.patch
rename to patches/server/0733-Optimise-general-POI-access.patch
diff --git a/patches/server/0733-Add-more-async-catchers.patch b/patches/server/0734-Add-more-async-catchers.patch
similarity index 100%
rename from patches/server/0733-Add-more-async-catchers.patch
rename to patches/server/0734-Add-more-async-catchers.patch
diff --git a/patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch
similarity index 100%
rename from patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch
rename to patches/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch
diff --git a/patches/server/0735-Optimise-chunk-tick-iteration.patch b/patches/server/0736-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/0735-Optimise-chunk-tick-iteration.patch
rename to patches/server/0736-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0736-Execute-chunk-tasks-mid-tick.patch b/patches/server/0737-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0736-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0737-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0737-Do-not-copy-visible-chunks.patch b/patches/server/0738-Do-not-copy-visible-chunks.patch
similarity index 100%
rename from patches/server/0737-Do-not-copy-visible-chunks.patch
rename to patches/server/0738-Do-not-copy-visible-chunks.patch
diff --git a/patches/server/0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0739-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0739-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0739-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0740-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0739-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0740-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0740-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0741-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/0740-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0741-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0741-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0742-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0741-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0742-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0742-Distance-manager-tick-timings.patch b/patches/server/0743-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0742-Distance-manager-tick-timings.patch
rename to patches/server/0743-Distance-manager-tick-timings.patch
diff --git a/patches/server/0743-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0744-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0743-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0744-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0745-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0745-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0745-Add-packet-limiter-config.patch b/patches/server/0746-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0745-Add-packet-limiter-config.patch
rename to patches/server/0746-Add-packet-limiter-config.patch
diff --git a/patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0747-Use-correct-LevelStem-registry-when-loading-default-.patch
similarity index 96%
rename from patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch
rename to patches/server/0747-Use-correct-LevelStem-registry-when-loading-default-.patch
index 452390ee7..3c74067e0 100644
--- a/patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/server/0747-Use-correct-LevelStem-registry-when-loading-default-.patch
@@ -24,7 +24,7 @@ index 8da1226a6c293abb038d10c7921a77ed71ad06cc..f958f0ae738a6fb26400e17e54c8d69e
          } else {
              Holder<E> holder = registry.getOrCreateHolderOrThrow(entryKey);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 17efe9e0a17672b815c64491dbca70b7519b6aca..79153def3866e9761fcd6eca7d81574fe64f2895 100644
+index 6f078f69f4da1bd988f02156351c481b6da04b55..d916f88e48e0097d9852a231b35431a06745d325 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -550,7 +550,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0748-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0748-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0748-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0749-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0748-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0749-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0749-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0750-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0749-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0750-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0750-Time-scoreboard-search.patch b/patches/server/0751-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0750-Time-scoreboard-search.patch
rename to patches/server/0751-Time-scoreboard-search.patch
diff --git a/patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0752-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 94%
rename from patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0752-Send-full-pos-packets-for-hard-colliding-entities.patch
index 350a67a86..204e9d0eb 100644
--- a/patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0752-Send-full-pos-packets-for-hard-colliding-entities.patch
@@ -9,7 +9,7 @@ Configurable under
 `send-full-pos-for-hard-colliding-entities`
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 4d5abfd4fdb0fb0d00840c8a6ef601e78b090888..4bfe42e8a829d7ea11e086822050b43f20ef7b42 100644
+index 8988561facae5c41dc64929d742316b104ddbbfa..01ee5eb27571847fff6e8cbd5b32b823121ccb8b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -158,7 +158,7 @@ public class ServerEntity {
diff --git a/patches/server/0752-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0753-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0752-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0753-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0753-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0754-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0753-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0754-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0754-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0755-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0754-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0755-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0756-Allow-removal-addition-of-entities-to-entity-ticklis.patch
similarity index 100%
rename from patches/server/0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch
rename to patches/server/0756-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0756-Optimise-random-block-ticking.patch b/patches/server/0757-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0756-Optimise-random-block-ticking.patch
rename to patches/server/0757-Optimise-random-block-ticking.patch
diff --git a/patches/server/0757-Optimise-non-flush-packet-sending.patch b/patches/server/0758-Optimise-non-flush-packet-sending.patch
similarity index 96%
rename from patches/server/0757-Optimise-non-flush-packet-sending.patch
rename to patches/server/0758-Optimise-non-flush-packet-sending.patch
index 771add779..4ac3de41b 100644
--- a/patches/server/0757-Optimise-non-flush-packet-sending.patch
+++ b/patches/server/0758-Optimise-non-flush-packet-sending.patch
@@ -20,7 +20,7 @@ up on this optimisation before he came along.
 Locally this patch drops the entity tracker tick by a full 1.5x.
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index f13c93764d6026b7e53123a8f6f123d986ded3a5..dffeba1eda35026ea23012ecd47053ca43c6f0d5 100644
+index 8c6e2aa1a5e98456684f74d677ac0af24aa90246..7ee144a5c734af6e1a8288e13d2d1305535b66a2 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -50,6 +50,8 @@ import org.slf4j.Logger;
diff --git a/patches/server/0758-Optimise-nearby-player-lookups.patch b/patches/server/0759-Optimise-nearby-player-lookups.patch
similarity index 100%
rename from patches/server/0758-Optimise-nearby-player-lookups.patch
rename to patches/server/0759-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0759-Optimise-WorldServer-notify.patch b/patches/server/0760-Optimise-WorldServer-notify.patch
similarity index 100%
rename from patches/server/0759-Optimise-WorldServer-notify.patch
rename to patches/server/0760-Optimise-WorldServer-notify.patch
diff --git a/patches/server/0760-Remove-streams-for-villager-AI.patch b/patches/server/0761-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0760-Remove-streams-for-villager-AI.patch
rename to patches/server/0761-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0761-Rewrite-dataconverter-system.patch b/patches/server/0762-Rewrite-dataconverter-system.patch
similarity index 100%
rename from patches/server/0761-Rewrite-dataconverter-system.patch
rename to patches/server/0762-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0763-Use-Velocity-compression-and-cipher-natives.patch
similarity index 98%
rename from patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0763-Use-Velocity-compression-and-cipher-natives.patch
index e1d6b8311..dad040139 100644
--- a/patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0763-Use-Velocity-compression-and-cipher-natives.patch
@@ -268,7 +268,7 @@ index 792883afe53d2b7989c25a81c2f9a639d5e21d20..c04379ca8a4db0f4de46ad2b3b338431
          return this.threshold;
      }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index dffeba1eda35026ea23012ecd47053ca43c6f0d5..f76c52e4661ef740dc924b0704a9ce28982294f1 100644
+index 7ee144a5c734af6e1a8288e13d2d1305535b66a2..0e5f05d091710da9078021eb6e1a26a22e2d63dd 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -641,11 +641,28 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -341,7 +341,7 @@ index 9e7154c9df96d5a0577886d43a98a73626a8f189..af3e70920221b6bd127bb3aed7f1e0a7
                  protected void initChannel(Channel channel) {
                      try {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 71614fb07ba771ec9a00772074b031b77210d425..0a54be0ae91d95505896da6363f256161acfb6f8 100644
+index 3f3210fa043bee7e3a0f794e58dcba6c317e2de7..1a0a8ac23b320b680f475d2b6c679e21f6997edb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -338,12 +338,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0764-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0764-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0765-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
similarity index 100%
rename from patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
rename to patches/server/0765-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
diff --git a/patches/server/0765-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0766-Async-catch-modifications-to-critical-entity-state.patch
similarity index 100%
rename from patches/server/0765-Async-catch-modifications-to-critical-entity-state.patch
rename to patches/server/0766-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0766-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0767-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0766-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0767-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0768-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0768-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0768-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0769-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0768-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0769-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0770-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0770-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0771-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0771-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0771-Ensure-valid-vehicle-status.patch b/patches/server/0772-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0771-Ensure-valid-vehicle-status.patch
rename to patches/server/0772-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0772-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0773-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0772-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0773-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0774-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0774-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0774-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0775-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0774-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0775-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0775-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0776-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0775-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0776-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0776-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0777-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
similarity index 100%
rename from patches/server/0776-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
rename to patches/server/0777-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
diff --git a/patches/server/0777-Preserve-overstacked-loot.patch b/patches/server/0778-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0777-Preserve-overstacked-loot.patch
rename to patches/server/0778-Preserve-overstacked-loot.patch
diff --git a/patches/server/0778-Update-head-rotation-in-missing-places.patch b/patches/server/0779-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0778-Update-head-rotation-in-missing-places.patch
rename to patches/server/0779-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0779-prevent-unintended-light-block-manipulation.patch b/patches/server/0780-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0779-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0780-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0780-Fix-CraftCriteria-defaults-map.patch b/patches/server/0781-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0780-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0781-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0781-Fix-upstreams-block-state-factories.patch b/patches/server/0782-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0781-Fix-upstreams-block-state-factories.patch
rename to patches/server/0782-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0782-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0783-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 98%
rename from patches/server/0782-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0783-Add-config-option-for-logging-player-ip-addresses.patch
index 9491892c7..2a0778c4c 100644
--- a/patches/server/0782-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0783-Add-config-option-for-logging-player-ip-addresses.patch
@@ -49,7 +49,7 @@ index af3e70920221b6bd127bb3aed7f1e0a7e9e4c322..597c7660bd517322d8bc9c5acef6956c
  
                              networkmanager.send(new ClientboundDisconnectPacket(ichatmutablecomponent), (future) -> {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 0a54be0ae91d95505896da6363f256161acfb6f8..dcabb783bed9160f7d602d551cf7e8d004abbca1 100644
+index 1a0a8ac23b320b680f475d2b6c679e21f6997edb..4bffd454a1403130d4454a1716aba15034ea9a95 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -229,7 +229,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0783-Configurable-feature-seeds.patch b/patches/server/0784-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0783-Configurable-feature-seeds.patch
rename to patches/server/0784-Configurable-feature-seeds.patch
diff --git a/patches/server/0784-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0785-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0784-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0785-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0785-Add-root-admin-user-detection.patch b/patches/server/0786-Add-root-admin-user-detection.patch
similarity index 97%
rename from patches/server/0785-Add-root-admin-user-detection.patch
rename to patches/server/0786-Add-root-admin-user-detection.patch
index 9708f83e8..b37abf6f8 100644
--- a/patches/server/0785-Add-root-admin-user-detection.patch
+++ b/patches/server/0786-Add-root-admin-user-detection.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 3fc342502ca24165ea5dcf0cc6e9867d0378d69f..c96bc85b8de905c1f8112a26dca644775c619a64 100644
+index 0ce34bb9104fb1c29bbcb65cfa5eb9b7a48809b4..83cc8db3ca76898f88a56c27c2b6fde6006723ba 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -184,6 +184,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0786-Always-allow-item-changing-in-Fireball.patch b/patches/server/0787-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0786-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0787-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0787-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0788-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0787-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0788-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0788-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0788-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0789-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0790-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0789-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0790-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0790-Rewrite-the-light-engine.patch b/patches/server/0791-Rewrite-the-light-engine.patch
similarity index 100%
rename from patches/server/0790-Rewrite-the-light-engine.patch
rename to patches/server/0791-Rewrite-the-light-engine.patch
diff --git a/patches/server/0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0792-Always-parse-protochunk-light-sources-unless-it-is-m.patch
similarity index 96%
rename from patches/server/0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch
rename to patches/server/0792-Always-parse-protochunk-light-sources-unless-it-is-m.patch
index d0088f6fd..6ebf11f2d 100644
--- a/patches/server/0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch
+++ b/patches/server/0792-Always-parse-protochunk-light-sources-unless-it-is-m.patch
@@ -8,7 +8,7 @@ Chunks not marked as lit will always go through the light engine,
 so they should always have their block sources parsed.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index 5e29c311e69fc8b5743f41c145c5e482fde53e28..fe212deaf38e33e652aa109b42d5962ba349f96f 100644
+index e843b0684693867dad566aa87104fdbab2dbeaca..dd0bb7a0b27bf7eb60e606398d0bd3fe5b1f5af5 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -320,16 +320,33 @@ public class ChunkSerializer {
diff --git a/patches/server/0792-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0793-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0792-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0793-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0793-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 97%
rename from patches/server/0793-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 7781ede3b..cf9b61711 100644
--- a/patches/server/0793-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -18,7 +18,7 @@ index 0c79613597e9ed1fbeeb36e9cb60a70bbda17bb9..79593d42ef881aa96eab7ea1e50683fa
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 4bfe42e8a829d7ea11e086822050b43f20ef7b42..28e73bba054c05c82873cb20eae53e93f99ae2de 100644
+index 01ee5eb27571847fff6e8cbd5b32b823121ccb8b..69c5145136c7d5303e9a1ad93fa981faf0033055 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -303,7 +303,10 @@ public class ServerEntity {
diff --git a/patches/server/0794-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0795-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 98%
rename from patches/server/0794-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0795-Hide-unnecessary-itemmeta-from-clients.patch
index c6cbb7c5b..a5c9c326a 100644
--- a/patches/server/0794-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0795-Hide-unnecessary-itemmeta-from-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Hide unnecessary itemmeta from clients
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 28e73bba054c05c82873cb20eae53e93f99ae2de..c476c4f16edfb0d5c1d94c86f13b35a428d6137a 100644
+index 69c5145136c7d5303e9a1ad93fa981faf0033055..ed7004cb5f5aa6c330d3783cb7b4bfeaeb69aba2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -305,7 +305,7 @@ public class ServerEntity {
diff --git a/patches/server/0795-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0796-Fix-kelp-modifier-changing-growth-for-other-crops.patch
similarity index 100%
rename from patches/server/0795-Fix-kelp-modifier-changing-growth-for-other-crops.patch
rename to patches/server/0796-Fix-kelp-modifier-changing-growth-for-other-crops.patch
diff --git a/patches/server/0796-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0797-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0796-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0797-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0797-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0798-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0797-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0798-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0798-Add-player-health-update-API.patch b/patches/server/0799-Add-player-health-update-API.patch
similarity index 95%
rename from patches/server/0798-Add-player-health-update-API.patch
rename to patches/server/0799-Add-player-health-update-API.patch
index 08c961dbc..58981109f 100644
--- a/patches/server/0798-Add-player-health-update-API.patch
+++ b/patches/server/0799-Add-player-health-update-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add player health update API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c27b099fb6636666612044935b598763df7c9251..bf36699c7844b78d63eb252acd5006f4f06a5ec4 100644
+index 47c74e687610bba419d973461eb19c1ab5f09472..d5754d3bf8bcdb5c0de98b833a99517a399e025e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2133,9 +2133,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0799-Optimize-HashMapPalette.patch b/patches/server/0800-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0799-Optimize-HashMapPalette.patch
rename to patches/server/0800-Optimize-HashMapPalette.patch
diff --git a/patches/server/0800-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0801-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 98%
rename from patches/server/0800-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0801-Allow-delegation-to-vanilla-chunk-gen.patch
index db9aa8e22..acae9661a 100644
--- a/patches/server/0800-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0801-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index efaaa74878ad18082a0b95ce2697b3638bc1284b..745f8a167976633d1d26e530412dacf3ec469197 100644
+index de43370cb6a4f2e8d32a8c35478af27dd9f909a4..bb9badc79bd153bda9cd841a5817f36bb93ff1a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2298,6 +2298,90 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0802-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 100%
rename from patches/server/0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0802-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0802-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0803-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0802-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0803-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0803-Actually-unload-POI-data.patch b/patches/server/0804-Actually-unload-POI-data.patch
similarity index 100%
rename from patches/server/0803-Actually-unload-POI-data.patch
rename to patches/server/0804-Actually-unload-POI-data.patch
diff --git a/patches/server/0804-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0805-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0804-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0805-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0805-Update-Log4j.patch b/patches/server/0806-Update-Log4j.patch
similarity index 100%
rename from patches/server/0805-Update-Log4j.patch
rename to patches/server/0806-Update-Log4j.patch
diff --git a/patches/server/0806-Add-more-Campfire-API.patch b/patches/server/0807-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0806-Add-more-Campfire-API.patch
rename to patches/server/0807-Add-more-Campfire-API.patch
diff --git a/patches/server/0807-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0808-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0807-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0808-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0808-Fix-tripwire-state-inconsistency.patch b/patches/server/0809-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0808-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0809-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0809-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0810-Fix-fluid-logging-on-Block-breakNaturally.patch
similarity index 100%
rename from patches/server/0809-Fix-fluid-logging-on-Block-breakNaturally.patch
rename to patches/server/0810-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0810-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0811-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0810-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0811-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0811-Improve-scoreboard-entries.patch b/patches/server/0812-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0811-Improve-scoreboard-entries.patch
rename to patches/server/0812-Improve-scoreboard-entries.patch
diff --git a/patches/server/0812-Entity-powdered-snow-API.patch b/patches/server/0813-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0812-Entity-powdered-snow-API.patch
rename to patches/server/0813-Entity-powdered-snow-API.patch
diff --git a/patches/server/0813-Add-API-for-item-entity-health.patch b/patches/server/0814-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0813-Add-API-for-item-entity-health.patch
rename to patches/server/0814-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0814-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0815-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0814-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0815-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0815-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0815-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0816-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0817-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0816-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0817-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0817-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0818-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0817-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0818-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0818-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0819-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0818-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0819-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0819-Fix-bees-aging-inside-hives.patch b/patches/server/0820-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0819-Fix-bees-aging-inside-hives.patch
rename to patches/server/0820-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0820-Bucketable-API.patch b/patches/server/0821-Bucketable-API.patch
similarity index 100%
rename from patches/server/0820-Bucketable-API.patch
rename to patches/server/0821-Bucketable-API.patch
diff --git a/patches/server/0821-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0822-Check-player-world-in-endPortalSoundRadius.patch
similarity index 100%
rename from patches/server/0821-Check-player-world-in-endPortalSoundRadius.patch
rename to patches/server/0822-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0822-Validate-usernames.patch b/patches/server/0823-Validate-usernames.patch
similarity index 97%
rename from patches/server/0822-Validate-usernames.patch
rename to patches/server/0823-Validate-usernames.patch
index 42d80bb82..78de6397e 100644
--- a/patches/server/0822-Validate-usernames.patch
+++ b/patches/server/0823-Validate-usernames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index dcabb783bed9160f7d602d551cf7e8d004abbca1..e581656c4450be708f1a91a42b5b1da9105df6f3 100644
+index 4bffd454a1403130d4454a1716aba15034ea9a95..f18c24266eecdc3d108c6523da6b75985bba291a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -70,6 +70,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0823-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0824-Fix-saving-configs-with-more-long-comments.patch
similarity index 100%
rename from patches/server/0823-Fix-saving-configs-with-more-long-comments.patch
rename to patches/server/0824-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0824-Make-water-animal-spawn-height-configurable.patch b/patches/server/0825-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0824-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0825-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0826-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 97%
rename from patches/server/0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0826-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index c0756dcef..5dfd917e9 100644
--- a/patches/server/0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0826-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 79153def3866e9761fcd6eca7d81574fe64f2895..89c92a626df832b2be41064ab48b10b981c06016 100644
+index d916f88e48e0097d9852a231b35431a06745d325..b0300d08475b4377e26bd5c9c432b554849b452a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -559,7 +559,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index 79153def3866e9761fcd6eca7d81574fe64f2895..89c92a626df832b2be41064ab48b10b9
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 745f8a167976633d1d26e530412dacf3ec469197..b54a924734145a307dfa46c88bc01d548b479671 100644
+index bb9badc79bd153bda9cd841a5817f36bb93ff1a0..1d6622f7b549aced182975c64341d61fa14db86c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1201,7 +1201,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0826-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0827-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0826-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0827-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0827-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0828-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0827-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0828-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0828-Multiple-Entries-with-Scoreboards.patch b/patches/server/0829-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0828-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0829-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0829-Reset-placed-block-on-exception.patch b/patches/server/0830-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0829-Reset-placed-block-on-exception.patch
rename to patches/server/0830-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0830-Add-configurable-height-for-slime-spawn.patch b/patches/server/0831-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0830-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0831-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0831-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0832-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0831-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0832-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0832-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0833-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0832-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0833-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0833-Kick-on-main-for-illegal-chars.patch b/patches/server/0834-Kick-on-main-for-illegal-chars.patch
similarity index 100%
rename from patches/server/0833-Kick-on-main-for-illegal-chars.patch
rename to patches/server/0834-Kick-on-main-for-illegal-chars.patch
diff --git a/patches/server/0834-Multi-Block-Change-API-Implementation.patch b/patches/server/0835-Multi-Block-Change-API-Implementation.patch
similarity index 97%
rename from patches/server/0834-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0835-Multi-Block-Change-API-Implementation.patch
index 155b70e6c..1f7099b13 100644
--- a/patches/server/0834-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0835-Multi-Block-Change-API-Implementation.patch
@@ -25,7 +25,7 @@ index 82ea4fabd5732052a286d50bcff8bbcc2c4aa7d7..652bea6868a03a5315965f79c76172fb
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bf36699c7844b78d63eb252acd5006f4f06a5ec4..bcc13411b91850f594838e77e04448b49c875b07 100644
+index d5754d3bf8bcdb5c0de98b833a99517a399e025e..04b991ec6a808839df1d2b5037ad386bda5094fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -29,6 +29,7 @@ import java.util.logging.Logger;
diff --git a/patches/server/0835-Fix-NotePlayEvent.patch b/patches/server/0836-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0835-Fix-NotePlayEvent.patch
rename to patches/server/0836-Fix-NotePlayEvent.patch
diff --git a/patches/server/0836-Freeze-Tick-Lock-API.patch b/patches/server/0837-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0836-Freeze-Tick-Lock-API.patch
rename to patches/server/0837-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0837-Dolphin-API.patch b/patches/server/0838-Dolphin-API.patch
similarity index 100%
rename from patches/server/0837-Dolphin-API.patch
rename to patches/server/0838-Dolphin-API.patch
diff --git a/patches/server/0838-More-PotionEffectType-API.patch b/patches/server/0839-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0838-More-PotionEffectType-API.patch
rename to patches/server/0839-More-PotionEffectType-API.patch
diff --git a/patches/server/0839-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0840-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0839-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0840-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0841-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 98%
rename from patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0841-API-for-creating-command-sender-which-forwards-feedb.patch
index e67db46bf..c911253e4 100644
--- a/patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0841-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b54a924734145a307dfa46c88bc01d548b479671..4a3810037e5d56e1d279a715d5e16c377740b481 100644
+index 1d6622f7b549aced182975c64341d61fa14db86c..5f7a77ec7047d2fb0bc64608e0e74a7e524c93c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1969,6 +1969,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0841-Add-config-for-stronghold-seed.patch b/patches/server/0842-Add-config-for-stronghold-seed.patch
similarity index 96%
rename from patches/server/0841-Add-config-for-stronghold-seed.patch
rename to patches/server/0842-Add-config-for-stronghold-seed.patch
index ba72abba3..c8249beb6 100644
--- a/patches/server/0841-Add-config-for-stronghold-seed.patch
+++ b/patches/server/0842-Add-config-for-stronghold-seed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for stronghold seed
 
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index ec7343c7acb438781026b25390528889209fe97a..13e67cd49ce37c76325ddb2277fde44c871a1901 100644
+index ef53c68c1996e99bc6b6048d5b1bc290cf218158..cdfe2589ca598263d58a11a978e176ab3ecb87e6 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -236,7 +236,13 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0842-Implement-regenerateChunk.patch b/patches/server/0843-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0842-Implement-regenerateChunk.patch
rename to patches/server/0843-Implement-regenerateChunk.patch
diff --git a/patches/server/0843-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0844-Log-exceptions-thrown-during-chat-processing.patch
similarity index 100%
rename from patches/server/0843-Log-exceptions-thrown-during-chat-processing.patch
rename to patches/server/0844-Log-exceptions-thrown-during-chat-processing.patch
diff --git a/patches/server/0844-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0845-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0844-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0845-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0845-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0846-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 91%
rename from patches/server/0845-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0846-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 47573f9c8..0f92ac8a0 100644
--- a/patches/server/0845-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0846-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4a3810037e5d56e1d279a715d5e16c377740b481..5765039cfd016732ca20fa656cdf76b478765421 100644
+index 5f7a77ec7047d2fb0bc64608e0e74a7e524c93c9..4e5cdd103758c5c17467a72dcaee837d7dbf4b8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2138,6 +2138,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0846-Add-GameEvent-tags.patch b/patches/server/0847-Add-GameEvent-tags.patch
similarity index 97%
rename from patches/server/0846-Add-GameEvent-tags.patch
rename to patches/server/0847-Add-GameEvent-tags.patch
index c1dd1233c..4b0ef43c9 100644
--- a/patches/server/0846-Add-GameEvent-tags.patch
+++ b/patches/server/0847-Add-GameEvent-tags.patch
@@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..cb78a3d4e21376ea24347187478525d5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5765039cfd016732ca20fa656cdf76b478765421..cf0cb900b71eb2369795b51350be828b219613f5 100644
+index 4e5cdd103758c5c17467a72dcaee837d7dbf4b8e..9035189f4640ecd7c642410824b61b0cbd309358 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2544,6 +2544,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0847-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0848-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 94%
rename from patches/server/0847-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0848-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 095d993b1..c2468d078 100644
--- a/patches/server/0847-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0848-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 89c92a626df832b2be41064ab48b10b981c06016..8b6b0c3998e57551b1fc6e2918edfde0abea8f35 100644
+index b0300d08475b4377e26bd5c9c432b554849b452a..9c215a77ca24ab2c75709c867c1d92ad7c97f1ea 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1312,6 +1312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0848-Replace-ticket-level-propagator.patch b/patches/server/0849-Replace-ticket-level-propagator.patch
similarity index 100%
rename from patches/server/0848-Replace-ticket-level-propagator.patch
rename to patches/server/0849-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0849-Furnace-RecipesUsed-API.patch b/patches/server/0850-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0849-Furnace-RecipesUsed-API.patch
rename to patches/server/0850-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0850-Configurable-sculk-sensor-listener-range.patch b/patches/server/0851-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0850-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0851-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0851-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0852-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0851-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0852-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0852-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0853-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0852-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0853-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0853-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0854-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0853-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0854-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0854-Fix-Entity-Position-Desync.patch b/patches/server/0855-Fix-Entity-Position-Desync.patch
similarity index 93%
rename from patches/server/0854-Fix-Entity-Position-Desync.patch
rename to patches/server/0855-Fix-Entity-Position-Desync.patch
index 6ce67801e..b5130a4c3 100644
--- a/patches/server/0854-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0855-Fix-Entity-Position-Desync.patch
@@ -9,7 +9,7 @@ This excludes hanging entities, as this fix caused problematic behavior due to t
 position field.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index c476c4f16edfb0d5c1d94c86f13b35a428d6137a..0bc963fc214da203a6e505fdd5edee3b1efc03df 100644
+index ed7004cb5f5aa6c330d3783cb7b4bfeaeb69aba2..946cde51334568c62d9546254a8d4e5d46d95324 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -152,7 +152,7 @@ public class ServerEntity {
diff --git a/patches/server/0855-Custom-Potion-Mixes.patch b/patches/server/0856-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0855-Custom-Potion-Mixes.patch
rename to patches/server/0856-Custom-Potion-Mixes.patch
diff --git a/patches/server/0856-Replace-player-chunk-loader-system.patch b/patches/server/0857-Replace-player-chunk-loader-system.patch
similarity index 100%
rename from patches/server/0856-Replace-player-chunk-loader-system.patch
rename to patches/server/0857-Replace-player-chunk-loader-system.patch
diff --git a/patches/server/0857-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0858-Fix-Fluid-tags-isTagged-method.patch
similarity index 100%
rename from patches/server/0857-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0858-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0858-Fix-World-locateNearestStructure.patch b/patches/server/0859-Fix-World-locateNearestStructure.patch
similarity index 100%
rename from patches/server/0858-Fix-World-locateNearestStructure.patch
rename to patches/server/0859-Fix-World-locateNearestStructure.patch
diff --git a/patches/server/0859-Force-close-world-loading-screen.patch b/patches/server/0860-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0859-Force-close-world-loading-screen.patch
rename to patches/server/0860-Force-close-world-loading-screen.patch
diff --git a/patches/server/0860-Fix-falling-block-spawn-methods.patch b/patches/server/0861-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0860-Fix-falling-block-spawn-methods.patch
rename to patches/server/0861-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0861-Expose-furnace-minecart-push-values.patch b/patches/server/0862-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0861-Expose-furnace-minecart-push-values.patch
rename to patches/server/0862-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0862-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0863-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0862-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0863-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0863-Fix-save-problems-on-shutdown.patch b/patches/server/0864-Fix-save-problems-on-shutdown.patch
similarity index 100%
rename from patches/server/0863-Fix-save-problems-on-shutdown.patch
rename to patches/server/0864-Fix-save-problems-on-shutdown.patch
diff --git a/patches/server/0864-More-Projectile-API.patch b/patches/server/0865-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0864-More-Projectile-API.patch
rename to patches/server/0865-More-Projectile-API.patch
diff --git a/patches/server/0865-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0866-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0865-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0866-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0866-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0867-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0866-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0867-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0867-Implement-getComputedBiome-API.patch b/patches/server/0868-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0867-Implement-getComputedBiome-API.patch
rename to patches/server/0868-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0868-Make-some-itemstacks-nonnull.patch b/patches/server/0869-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0868-Make-some-itemstacks-nonnull.patch
rename to patches/server/0869-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0869-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0870-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
similarity index 100%
rename from patches/server/0869-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
rename to patches/server/0870-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0870-Implement-enchantWithLevels-API.patch b/patches/server/0871-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0870-Implement-enchantWithLevels-API.patch
rename to patches/server/0871-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0871-Fix-saving-in-unloadWorld.patch b/patches/server/0872-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0871-Fix-saving-in-unloadWorld.patch
rename to patches/server/0872-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0872-Buffer-OOB-setBlock-calls.patch b/patches/server/0873-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0872-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0873-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0873-Add-TameableDeathMessageEvent.patch b/patches/server/0874-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0873-Add-TameableDeathMessageEvent.patch
rename to patches/server/0874-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0874-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/server/0875-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
similarity index 100%
rename from patches/server/0874-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
rename to patches/server/0875-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
diff --git a/patches/server/0875-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0876-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0875-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0876-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0876-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0877-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0876-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0877-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0877-Guard-against-invalid-entity-positions.patch b/patches/server/0878-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0877-Guard-against-invalid-entity-positions.patch
rename to patches/server/0878-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0878-cache-resource-keys.patch b/patches/server/0879-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0878-cache-resource-keys.patch
rename to patches/server/0879-cache-resource-keys.patch
diff --git a/patches/server/0879-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0880-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0879-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0880-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0880-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0881-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0880-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0881-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0881-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0882-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0881-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0882-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0882-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0883-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0882-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0883-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0883-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0884-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0883-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0884-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0884-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0885-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0884-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0885-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0885-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0886-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0885-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0886-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0886-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0887-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0886-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0887-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0887-WorldCreator-keepSpawnLoaded.patch b/patches/server/0888-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0887-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0888-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0888-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0889-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0888-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0889-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0889-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0890-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0889-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0890-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0890-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0891-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0890-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0891-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0891-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0892-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0891-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0892-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0892-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0893-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0892-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0893-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0893-Add-PlayerStopUsingItemEvent.patch b/patches/server/0894-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0893-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0894-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0894-FallingBlock-auto-expire-setting.patch b/patches/server/0895-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0894-FallingBlock-auto-expire-setting.patch
rename to patches/server/0895-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0895-Don-t-tick-markers.patch b/patches/server/0896-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0895-Don-t-tick-markers.patch
rename to patches/server/0896-Don-t-tick-markers.patch
diff --git a/patches/server/0896-Do-not-accept-invalid-client-settings.patch b/patches/server/0897-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0896-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0897-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0897-Add-support-for-Proxy-Protocol.patch b/patches/server/0898-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0897-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0898-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0898-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0899-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0898-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0899-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0899-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0900-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0899-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0900-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0900-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0901-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0900-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0901-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0901-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0902-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0901-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0902-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0902-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0903-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0902-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0903-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0903-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0904-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0903-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0904-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0904-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0905-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0904-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0905-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0905-Dont-resent-entity-on-art-update.patch b/patches/server/0906-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0905-Dont-resent-entity-on-art-update.patch
rename to patches/server/0906-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0906-Untrash-chat-handling.patch b/patches/server/0907-Untrash-chat-handling.patch
similarity index 100%
rename from patches/server/0906-Untrash-chat-handling.patch
rename to patches/server/0907-Untrash-chat-handling.patch
diff --git a/patches/server/0907-Add-missing-spawn-eggs.patch b/patches/server/0908-Add-missing-spawn-eggs.patch
similarity index 100%
rename from patches/server/0907-Add-missing-spawn-eggs.patch
rename to patches/server/0908-Add-missing-spawn-eggs.patch
diff --git a/patches/server/0908-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0909-Remove-invalid-signature-login-stacktrace.patch
similarity index 100%
rename from patches/server/0908-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0909-Remove-invalid-signature-login-stacktrace.patch