diff --git a/patches/removed/1.17/0369-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/removed/1.17/0369-Avoid-hopper-searches-if-there-are-no-items.patch
deleted file mode 100644
index f4d9a785b..000000000
--- a/patches/removed/1.17/0369-Avoid-hopper-searches-if-there-are-no-items.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: CullanP <cullanpage@gmail.com>
-Date: Thu, 3 Mar 2016 02:13:38 -0600
-Subject: [PATCH] Avoid hopper searches if there are no items
-1.17: figure this out after methods got moved
-Hoppers searching for items and minecarts is the most expensive part of hopper ticking.
-We keep track of the number of minecarts and items in a chunk.
-If there are no items in the chunk, we skip searching for items.
-If there are no minecarts in the chunk, we skip searching for them.
-
-Usually hoppers aren't near items, so we can skip most item searches.
-And since minecart hoppers are used _very_ rarely near we can avoid alot of searching there.
-
-Combined, this adds up a lot.
-
-diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-index d3640975c5a33b4911428760691215905b987385..e7facd849e3511c64b4ae44b34382f4a4985f2a4 100644
---- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
-+++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-@@ -16,6 +16,7 @@ public final class EntitySelector {
- public static final Predicate<Entity> ENTITY_NOT_BEING_RIDDEN = (entity) -> {
- return entity.isAlive() && !entity.isVehicle() && !entity.isPassenger();
- };
-+ public static final Predicate<Entity> isInventory() { return CONTAINER_ENTITY_SELECTOR; } // Paper - OBFHELPER
- public static final Predicate<Entity> CONTAINER_ENTITY_SELECTOR = (entity) -> {
- return entity instanceof Container && entity.isAlive();
- };
-diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 85861545ec4620a6cfd06876dad091637bd29b0b..4fef3abe4b416cbebe1b456468b5c3e162de18f1 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -31,10 +31,13 @@ import net.minecraft.server.level.ChunkHolder;
- import net.minecraft.server.level.ServerChunkCache;
- import net.minecraft.server.level.ServerLevel;
- import net.minecraft.util.Mth;
-+import net.minecraft.world.Container;
- import net.minecraft.world.entity.Entity;
-+import net.minecraft.world.entity.EntitySelector;
- import net.minecraft.world.entity.EntityType;
- import net.minecraft.world.entity.boss.EnderDragonPart;
- import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
-+import net.minecraft.world.entity.item.ItemEntity;
- import net.minecraft.world.level.ChunkPos;
- import net.minecraft.world.level.ChunkTickList;
- import net.minecraft.world.level.EmptyTickList;
-@@ -122,6 +125,10 @@ public class LevelChunk implements ChunkAccess {
- return removed;
- }
- }
-+ // Track the number of minecarts and items
-+ // Keep this synced with entitySlices.add() and entitySlices.remove()
-+ private final int[] itemCounts = new int[16];
-+ private final int[] inventoryEntityCounts = new int[16];
- // Paper end
-
- public LevelChunk(Level world, ChunkPos pos, ChunkBiomeContainer biomes, UpgradeData upgradeData, TickList<Block> blockTickScheduler, TickList<Fluid> fluidTickScheduler, long inhabitedTime, @Nullable LevelChunkSection[] sections, @Nullable Consumer<LevelChunk> loadToWorldConsumer) {
-@@ -581,6 +588,13 @@ public class LevelChunk implements ChunkAccess {
- entity.zChunk = this.chunkPos.z;
- this.entities.add(entity); // Paper - per chunk entity list
- this.entitySlices[k].add(entity);
-+ // Paper start
-+ if (entity instanceof ItemEntity) {
-+ itemCounts[k]++;
-+ } else if (entity instanceof Container) {
-+ inventoryEntityCounts[k]++;
-+ }
-+ // Paper end
- entity.entitySlice = this.entitySlices[k]; // Paper
- this.markUnsaved(); // Paper
- }
-@@ -614,6 +628,11 @@ public class LevelChunk implements ChunkAccess {
- if (!this.entitySlices[section].remove(entity)) {
- return;
- }
-+ if (entity instanceof ItemEntity) {
-+ itemCounts[section]--;
-+ } else if (entity instanceof Container) {
-+ inventoryEntityCounts[section]--;
-+ }
- entityCounts.decrement(entity.getMinecraftKeyString());
- this.markUnsaved(); // Paper
- // Paper end
-@@ -899,6 +918,14 @@ public class LevelChunk implements ChunkAccess {
- for (int k = i; k <= j; ++k) {
- Iterator iterator = this.entitySlices[k].iterator(); // Spigot
-
-+ // Paper start - Don't search for inventories if we have none, and that is all we want
-+ /*
-+ * We check if they want inventories by seeing if it is the static `IEntitySelector.d`
-+ *
-+ * Make sure the inventory selector stays in sync.
-+ * It should be the one that checks `var1 instanceof IInventory && var1.isAlive()`
-+ */
-+ if (predicate == EntitySelector.isInventory() && inventoryEntityCounts[k] <= 0) continue;
- while (iterator.hasNext()) {
- T entity = (T) iterator.next(); // CraftBukkit - decompile error
- if (entity.shouldBeRemoved) continue; // Paper
-@@ -919,9 +946,29 @@ public class LevelChunk implements ChunkAccess {
- i = Mth.clamp(i, 0, this.entitySlices.length - 1);
- j = Mth.clamp(j, 0, this.entitySlices.length - 1);
-
-+ // Paper start
-+ int[] counts;
-+ if (ItemEntity.class.isAssignableFrom(entityClass)) {
-+ counts = itemCounts;
-+ } else if (Container.class.isAssignableFrom(entityClass)) {
-+ counts = inventoryEntityCounts;
-+ } else {
-+ counts = null;
-+ }
-+ // Paper end
- for (int k = i; k <= j; ++k) {
-+ if (counts != null && counts[k] <= 0) continue; // Paper - Don't check a chunk if it doesn't have the type we are looking for
- Iterator iterator = this.entitySlices[k].iterator(); // Spigot
-
-+ // Paper start - Don't search for inventories if we have none, and that is all we want
-+ /*
-+ * We check if they want inventories by seeing if it is the static `IEntitySelector.d`
-+ *
-+ * Make sure the inventory selector stays in sync.
-+ * It should be the one that checks `var1 instanceof IInventory && var1.isAlive()`
-+ */
-+ if (predicate == EntitySelector.isInventory() && inventoryEntityCounts[k] <= 0) continue;
-+ // Paper end
- while (iterator.hasNext()) {
- T t0 = (T) iterator.next(); // CraftBukkit - decompile error
- if (t0.shouldBeRemoved) continue; // Paper
diff --git a/patches/server/0369-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0369-Avoid-hopper-searches-if-there-are-no-items.patch
new file mode 100644
index 000000000..f2b4f51f8
--- /dev/null
+++ b/patches/server/0369-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -0,0 +1,142 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: CullanP <cullanpage@gmail.com>
+Date: Thu, 3 Mar 2016 02:13:38 -0600
+Subject: [PATCH] Avoid hopper searches if there are no items
+
+Hoppers searching for items and minecarts is the most expensive part of hopper ticking.
+We keep track of the number of minecarts and items in a chunk.
+If there are no items in the chunk, we skip searching for items.
+If there are no minecarts in the chunk, we skip searching for them.
+
+Usually hoppers aren't near items, so we can skip most item searches.
+And since minecart hoppers are used _very_ rarely near we can avoid alot of searching there.
+
+Combined, this adds up a lot.
+
+diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+index 507a70521a97c463d6fd22b788c39e9f458971c3..1dc1f7a5319e067b5f56c2fdadf04547ae1bc9ea 100644
+--- a/src/main/java/net/minecraft/world/level/Level.java
++++ b/src/main/java/net/minecraft/world/level/Level.java
+@@ -984,7 +984,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+ }
+ }
+
+- });
++ }, predicate == net.minecraft.world.entity.EntitySelector.CONTAINER_ENTITY_SELECTOR); // Paper
+ return list;
+ }
+
+diff --git a/src/main/java/net/minecraft/world/level/entity/EntitySection.java b/src/main/java/net/minecraft/world/level/entity/EntitySection.java
+index 9a7b2602c2549dd03ad097c4a922a10a5e869645..5342eafe25614d262eeb39fa517a242e27d998f6 100644
+--- a/src/main/java/net/minecraft/world/level/entity/EntitySection.java
++++ b/src/main/java/net/minecraft/world/level/entity/EntitySection.java
+@@ -12,6 +12,10 @@ public class EntitySection<T> {
+ protected static final Logger LOGGER = LogManager.getLogger();
+ private final ClassInstanceMultiMap<T> storage;
+ private Visibility chunkStatus;
++ // Paper start - track number of items and minecarts
++ public int itemCount;
++ public int inventoryEntityCount;
++ // Paper end
+
+ public EntitySection(Class<T> entityClass, Visibility status) {
+ this.chunkStatus = status;
+@@ -19,10 +23,24 @@ public class EntitySection<T> {
+ }
+
+ public void add(T obj) {
++ // Paper start
++ if (obj instanceof net.minecraft.world.entity.item.ItemEntity) {
++ this.itemCount++;
++ } else if (obj instanceof net.minecraft.world.Container) {
++ this.inventoryEntityCount++;
++ }
++ // Paper end
+ this.storage.add(obj);
+ }
+
+ public boolean remove(T obj) {
++ // Paper start
++ if (obj instanceof net.minecraft.world.entity.item.ItemEntity) {
++ this.itemCount--;
++ } else if (obj instanceof net.minecraft.world.Container) {
++ this.inventoryEntityCount--;
++ }
++ // Paper end
+ return this.storage.remove(obj);
+ }
+
+@@ -39,7 +57,7 @@ public class EntitySection<T> {
+ for(T object : this.storage.find(type.getBaseClass())) {
+ U object2 = (U)type.tryCast(object);
+ if (object2 != null && filter.test(object2)) {
+- action.accept((T)object2);
++ action.accept(object2); // Paper - decompile fix
+ }
+ }
+
+diff --git a/src/main/java/net/minecraft/world/level/entity/EntitySectionStorage.java b/src/main/java/net/minecraft/world/level/entity/EntitySectionStorage.java
+index 067138e3983959347d19754e668bb7a1f702bad0..24552500307c42f9f3dc5c4d9ba73a84a787423a 100644
+--- a/src/main/java/net/minecraft/world/level/entity/EntitySectionStorage.java
++++ b/src/main/java/net/minecraft/world/level/entity/EntitySectionStorage.java
+@@ -105,7 +105,7 @@ public class EntitySectionStorage<T extends EntityAccess> {
+
+ public LongSet getAllChunksWithExistingSections() {
+ LongSet longSet = new LongOpenHashSet();
+- this.sections.keySet().forEach((sectionPos) -> {
++ this.sections.keySet().forEach((java.util.function.LongConsumer) (sectionPos) -> { // Paper - decompile fix
+ longSet.add(getChunkKeyFromSectionKey(sectionPos));
+ });
+ return longSet;
+@@ -118,13 +118,20 @@ public class EntitySectionStorage<T extends EntityAccess> {
+ }
+
+ public void getEntities(AABB box, Consumer<T> action) {
++ // Paper start
++ this.getEntities(box, action, false);
++ }
++ public void getEntities(AABB box, Consumer<T> action, boolean isContainerSearch) {
++ // Paper end
+ this.forEachAccessibleSection(box, (entitySection) -> {
++ if (isContainerSearch && entitySection.inventoryEntityCount <= 0) return; // Paper
+ entitySection.getEntities(createBoundingBoxCheck(box), action);
+ });
+ }
+
+ public <U extends T> void getEntities(EntityTypeTest<T, U> filter, AABB box, Consumer<U> action) {
+ this.forEachAccessibleSection(box, (entitySection) -> {
++ if (filter.getBaseClass() == net.minecraft.world.entity.item.ItemEntity.class && entitySection.itemCount <= 0) return; // Paper
+ entitySection.getEntities(filter, createBoundingBoxCheck(box), action);
+ });
+ }
+diff --git a/src/main/java/net/minecraft/world/level/entity/LevelEntityGetter.java b/src/main/java/net/minecraft/world/level/entity/LevelEntityGetter.java
+index 9723a0ad61548c8c6c4c5ef20a150d5b17d80afd..da1ad0b2679e392ed81b50c15f012c63cb5c939e 100644
+--- a/src/main/java/net/minecraft/world/level/entity/LevelEntityGetter.java
++++ b/src/main/java/net/minecraft/world/level/entity/LevelEntityGetter.java
+@@ -17,6 +17,7 @@ public interface LevelEntityGetter<T extends EntityAccess> {
+ <U extends T> void get(EntityTypeTest<T, U> filter, Consumer<U> action);
+
+ void get(AABB box, Consumer<T> action);
++ void get(AABB box, Consumer<T> action, boolean isContainerSearch); // Paper
+
+ <U extends T> void get(EntityTypeTest<T, U> filter, AABB box, Consumer<U> action);
+ }
+diff --git a/src/main/java/net/minecraft/world/level/entity/LevelEntityGetterAdapter.java b/src/main/java/net/minecraft/world/level/entity/LevelEntityGetterAdapter.java
+index d5129c12c79eb6fe6b7e5f8eed4d24226423f5fd..3b13f6ea36a3bfecabe09221eb5c48dddab119db 100644
+--- a/src/main/java/net/minecraft/world/level/entity/LevelEntityGetterAdapter.java
++++ b/src/main/java/net/minecraft/world/level/entity/LevelEntityGetterAdapter.java
+@@ -38,7 +38,13 @@ public class LevelEntityGetterAdapter<T extends EntityAccess> implements LevelEn
+
+ @Override
+ public void get(AABB box, Consumer<T> action) {
+- this.sectionStorage.getEntities(box, action);
++ // Paper start
++ this.get(box, action, false);
++ }
++ @Override
++ public void get(AABB box, Consumer<T> action, boolean isContainerSearch) {
++ this.sectionStorage.getEntities(box, action, isContainerSearch);
++ // Paper end
+ }
+
+ @Override
diff --git a/patches/server/0369-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0370-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0369-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0370-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0370-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0371-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0370-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0371-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0371-Allow-overriding-the-java-version-check.patch b/patches/server/0372-Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from patches/server/0371-Allow-overriding-the-java-version-check.patch
rename to patches/server/0372-Allow-overriding-the-java-version-check.patch
diff --git a/patches/server/0372-Add-ThrownEggHatchEvent.patch b/patches/server/0373-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0372-Add-ThrownEggHatchEvent.patch
rename to patches/server/0373-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0373-Optimise-random-block-ticking.patch b/patches/server/0374-Optimise-random-block-ticking.patch
similarity index 99%
rename from patches/server/0373-Optimise-random-block-ticking.patch
rename to patches/server/0374-Optimise-random-block-ticking.patch
index d8b334052..f5938a427 100644
--- a/patches/server/0373-Optimise-random-block-ticking.patch
+++ b/patches/server/0374-Optimise-random-block-ticking.patch
@@ -266,7 +266,7 @@ index e638d982b4bd1d261a7282cad6dab98ad0b55213..e305173fd1652a8b88ae8a9b94d0fae0
public BlockPos getHomePos() { // Paper - public
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 507a70521a97c463d6fd22b788c39e9f458971c3..ea455e8aa7db5e9c397875e1fc8716cd52044c05 100644
+index 1dc1f7a5319e067b5f56c2fdadf04547ae1bc9ea..9d5dcaabe43ee36259b24063b4c74daddc7df773 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1300,10 +1300,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0374-Entity-Jump-API.patch b/patches/server/0375-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0374-Entity-Jump-API.patch
rename to patches/server/0375-Entity-Jump-API.patch
diff --git a/patches/server/0375-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0376-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from patches/server/0375-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0376-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0376-Make-the-GUI-graph-fancier.patch b/patches/server/0377-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0376-Make-the-GUI-graph-fancier.patch
rename to patches/server/0377-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0377-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0378-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0377-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0378-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0378-Prevent-teleporting-dead-entities.patch b/patches/server/0379-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from patches/server/0378-Prevent-teleporting-dead-entities.patch
rename to patches/server/0379-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0379-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0380-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0379-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0380-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0380-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0381-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0380-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0381-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0381-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0382-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0381-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0382-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0382-Optimise-Chunk-getFluid.patch b/patches/server/0383-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0382-Optimise-Chunk-getFluid.patch
rename to patches/server/0383-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0383-Optimise-TickListServer-by-rewriting-it.patch b/patches/server/0384-Optimise-TickListServer-by-rewriting-it.patch
similarity index 100%
rename from patches/server/0383-Optimise-TickListServer-by-rewriting-it.patch
rename to patches/server/0384-Optimise-TickListServer-by-rewriting-it.patch
diff --git a/patches/server/0384-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0385-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/0384-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0385-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0385-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0386-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0385-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0386-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0386-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0387-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0386-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0387-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0387-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0388-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from patches/server/0387-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0388-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0388-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0389-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/0388-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0389-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0389-Don-t-tick-dead-players.patch b/patches/server/0390-Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/0389-Don-t-tick-dead-players.patch
rename to patches/server/0390-Don-t-tick-dead-players.patch
diff --git a/patches/server/0390-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0391-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0390-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0391-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0391-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/patches/server/0392-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 100%
rename from patches/server/0391-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to patches/server/0392-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
diff --git a/patches/server/0392-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/patches/server/0393-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
similarity index 100%
rename from patches/server/0392-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
rename to patches/server/0393-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
diff --git a/patches/server/0393-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0394-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/0393-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0394-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0394-Add-tick-times-API-and-mspt-command.patch b/patches/server/0395-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from patches/server/0394-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0395-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0395-Expose-MinecraftServer-isRunning.patch b/patches/server/0396-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/server/0395-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0396-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0396-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0397-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0396-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0397-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0397-Remove-streams-from-Mob-AI-System.patch b/patches/server/0398-Remove-streams-from-Mob-AI-System.patch
similarity index 100%
rename from patches/server/0397-Remove-streams-from-Mob-AI-System.patch
rename to patches/server/0398-Remove-streams-from-Mob-AI-System.patch
diff --git a/patches/server/0398-Async-command-map-building.patch b/patches/server/0399-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0398-Async-command-map-building.patch
rename to patches/server/0399-Async-command-map-building.patch
diff --git a/patches/server/0399-Improved-Watchdog-Support.patch b/patches/server/0400-Improved-Watchdog-Support.patch
similarity index 99%
rename from patches/server/0399-Improved-Watchdog-Support.patch
rename to patches/server/0400-Improved-Watchdog-Support.patch
index 77f803c03..4f5188cdf 100644
--- a/patches/server/0399-Improved-Watchdog-Support.patch
+++ b/patches/server/0400-Improved-Watchdog-Support.patch
@@ -299,7 +299,7 @@ index 0ef3c4982df88a7991a56d983ac733daa8adc507..cdd797c6fc7507a0e6376f7d9c521be8
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ea455e8aa7db5e9c397875e1fc8716cd52044c05..6aeb3ff79f08ade7ddd0d328d1a01514a91f671a 100644
+index 9d5dcaabe43ee36259b24063b4c74daddc7df773..06f2f76636804cd5f997bbe1558a104bc24aa84a 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -837,6 +837,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0400-Optimize-Pathfinding.patch b/patches/server/0401-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0400-Optimize-Pathfinding.patch
rename to patches/server/0401-Optimize-Pathfinding.patch
diff --git a/patches/server/0401-Reduce-Either-Optional-allocation.patch b/patches/server/0402-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0401-Reduce-Either-Optional-allocation.patch
rename to patches/server/0402-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0402-Remove-streams-from-PairedQueue.patch b/patches/server/0403-Remove-streams-from-PairedQueue.patch
similarity index 100%
rename from patches/server/0402-Remove-streams-from-PairedQueue.patch
rename to patches/server/0403-Remove-streams-from-PairedQueue.patch
diff --git a/patches/server/0403-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0404-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0403-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0404-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0404-Prevent-opening-inventories-when-frozen.patch b/patches/server/0405-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0404-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0405-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0405-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0406-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from patches/server/0405-Optimise-ArraySetSorted-removeIf.patch
rename to patches/server/0406-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0406-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0407-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0406-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0407-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0407-Restrict-vanilla-teleport-command-to-valid-locations.patch b/patches/server/0408-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 100%
rename from patches/server/0407-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to patches/server/0408-Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/patches/server/0408-Implement-Player-Client-Options-API.patch b/patches/server/0409-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0408-Implement-Player-Client-Options-API.patch
rename to patches/server/0409-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0409-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0410-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from patches/server/0409-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to patches/server/0410-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/0410-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0411-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0410-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0411-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0411-Broadcast-join-message-to-console.patch b/patches/server/0412-Broadcast-join-message-to-console.patch
similarity index 100%
rename from patches/server/0411-Broadcast-join-message-to-console.patch
rename to patches/server/0412-Broadcast-join-message-to-console.patch
diff --git a/patches/server/0412-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0413-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 100%
rename from patches/server/0412-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0413-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0413-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0414-Load-Chunks-for-Login-Asynchronously.patch
similarity index 100%
rename from patches/server/0413-Load-Chunks-for-Login-Asynchronously.patch
rename to patches/server/0414-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/patches/server/0414-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0415-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/0414-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0415-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0415-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0416-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0415-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0416-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0416-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/patches/server/0417-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 100%
rename from patches/server/0416-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to patches/server/0417-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
diff --git a/patches/server/0417-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0418-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0417-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0418-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0418-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0419-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0418-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0419-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0419-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0420-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from patches/server/0419-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0420-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0420-Implement-Brigadier-Mojang-API.patch b/patches/server/0421-Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from patches/server/0420-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0421-Implement-Brigadier-Mojang-API.patch
diff --git a/patches/server/0421-Villager-Restocks-API.patch b/patches/server/0422-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0421-Villager-Restocks-API.patch
rename to patches/server/0422-Villager-Restocks-API.patch
diff --git a/patches/server/0422-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0423-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/0422-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0423-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0423-Expose-game-version.patch b/patches/server/0424-Expose-game-version.patch
similarity index 100%
rename from patches/server/0423-Expose-game-version.patch
rename to patches/server/0424-Expose-game-version.patch
diff --git a/patches/server/0424-Optimize-Voxel-Shape-Merging.patch b/patches/server/0425-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0424-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0425-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0425-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0426-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0425-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0426-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0426-Implement-Mob-Goal-API.patch b/patches/server/0427-Implement-Mob-Goal-API.patch
similarity index 100%
rename from patches/server/0426-Implement-Mob-Goal-API.patch
rename to patches/server/0427-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0427-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0428-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/server/0427-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0428-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0428-Optimize-isOutsideRange-to-use-distance-maps.patch b/patches/server/0429-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 100%
rename from patches/server/0428-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to patches/server/0429-Optimize-isOutsideRange-to-use-distance-maps.patch
diff --git a/patches/server/0429-Add-villager-reputation-API.patch b/patches/server/0430-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0429-Add-villager-reputation-API.patch
rename to patches/server/0430-Add-villager-reputation-API.patch
diff --git a/patches/server/0430-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0431-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0430-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0431-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0431-ExperienceOrbMergeEvent.patch b/patches/server/0432-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0431-ExperienceOrbMergeEvent.patch
rename to patches/server/0432-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0432-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0433-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0432-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0433-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0433-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0434-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0433-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0434-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0434-Potential-bed-API.patch b/patches/server/0435-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0434-Potential-bed-API.patch
rename to patches/server/0435-Potential-bed-API.patch
diff --git a/patches/server/0435-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0436-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from patches/server/0435-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0436-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0436-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0437-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0436-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0437-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0437-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0438-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 99%
rename from patches/server/0437-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0438-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 2c13e4ac2..6fa1cd4c6 100644
--- a/patches/server/0437-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0438-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -56,7 +56,7 @@ index cdf214fca3b0055efa56702470d9d2f890a8aead..a12af10e28f2d023ba6f916b5e7a5353
this.level.getProfiler().push("explosion_blocks");
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6aeb3ff79f08ade7ddd0d328d1a01514a91f671a..b969e7f2087aed5b1f97ce8593a25ada737daec9 100644
+index 06f2f76636804cd5f997bbe1558a104bc24aa84a..b92d930448757968cd6a178f4bcafae72c93044c 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -420,6 +420,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0438-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0439-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0438-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0439-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0439-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0440-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/0439-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0440-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0440-Ensure-safe-gateway-teleport.patch b/patches/server/0441-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0440-Ensure-safe-gateway-teleport.patch
rename to patches/server/0441-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0441-Add-option-for-console-having-all-permissions.patch b/patches/server/0442-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0441-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0442-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0442-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/patches/server/0443-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from patches/server/0442-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to patches/server/0443-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/patches/server/0443-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/patches/server/0444-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 100%
rename from patches/server/0443-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to patches/server/0444-Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/patches/server/0444-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0445-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0444-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0445-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0445-Maps-shouldn-t-load-chunks.patch b/patches/server/0446-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0445-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0446-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0446-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0447-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0446-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0447-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0447-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0448-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from patches/server/0447-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to patches/server/0448-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/patches/server/0448-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0449-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0448-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0449-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0449-incremental-chunk-saving.patch b/patches/server/0450-incremental-chunk-saving.patch
similarity index 100%
rename from patches/server/0449-incremental-chunk-saving.patch
rename to patches/server/0450-incremental-chunk-saving.patch
diff --git a/patches/server/0450-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0450-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0451-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0452-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0451-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0452-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0452-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0453-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0452-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0453-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0453-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0454-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0453-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0454-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0454-Fix-sand-duping.patch b/patches/server/0455-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0454-Fix-sand-duping.patch
rename to patches/server/0455-Fix-sand-duping.patch
diff --git a/patches/server/0455-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0456-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from patches/server/0455-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0456-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0456-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0457-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0456-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0457-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0457-Expose-Arrow-getItemStack.patch b/patches/server/0458-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from patches/server/0457-Expose-Arrow-getItemStack.patch
rename to patches/server/0458-Expose-Arrow-getItemStack.patch
diff --git a/patches/server/0458-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0459-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0458-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0459-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0459-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0460-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0459-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0460-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0460-Add-permission-for-command-blocks.patch b/patches/server/0461-Add-permission-for-command-blocks.patch
similarity index 100%
rename from patches/server/0460-Add-permission-for-command-blocks.patch
rename to patches/server/0461-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0461-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0462-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/0461-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0462-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0462-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/server/0463-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 100%
rename from patches/server/0462-Optimize-WorldBorder-collision-checks-and-air.patch
rename to patches/server/0463-Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/patches/server/0463-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0464-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from patches/server/0463-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0464-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0464-Paper-dumpitem-command.patch b/patches/server/0465-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0464-Paper-dumpitem-command.patch
rename to patches/server/0465-Paper-dumpitem-command.patch
diff --git a/patches/server/0465-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0466-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/0465-Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/0466-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0466-Improve-Legacy-Component-serialization-size.patch b/patches/server/0467-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0466-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0467-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0467-Support-old-UUID-format-for-NBT.patch b/patches/server/0468-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0467-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0468-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0468-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0469-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0468-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0469-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0469-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0470-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0469-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0470-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0471-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from patches/server/0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to patches/server/0471-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/server/0471-Remove-some-streams-from-structures.patch b/patches/server/0472-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0471-Remove-some-streams-from-structures.patch
rename to patches/server/0472-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0472-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0473-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0472-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0473-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0473-Support-components-in-ItemMeta.patch b/patches/server/0474-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0473-Support-components-in-ItemMeta.patch
rename to patches/server/0474-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0474-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0475-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0474-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0475-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0475-Add-entity-liquid-API.patch b/patches/server/0476-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0475-Add-entity-liquid-API.patch
rename to patches/server/0476-Add-entity-liquid-API.patch
diff --git a/patches/server/0476-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0477-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0476-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0477-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0477-Spawn-player-in-correct-world-on-login.patch b/patches/server/0478-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0477-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0478-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0478-Add-PrepareResultEvent.patch b/patches/server/0479-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0478-Add-PrepareResultEvent.patch
rename to patches/server/0479-Add-PrepareResultEvent.patch
diff --git a/patches/server/0479-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0480-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0479-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0480-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0480-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0481-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0480-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0481-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0481-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0482-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0481-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0482-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0482-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0483-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0482-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0483-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0483-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0484-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0483-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0484-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0484-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0485-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0484-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0485-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0485-Move-range-check-for-block-placing-up.patch b/patches/server/0486-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0485-Move-range-check-for-block-placing-up.patch
rename to patches/server/0486-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0486-Fix-SPIGOT-5989.patch b/patches/server/0487-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0486-Fix-SPIGOT-5989.patch
rename to patches/server/0487-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0487-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0488-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0487-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0488-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0488-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0489-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0488-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0489-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0489-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0490-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0489-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0490-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0490-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0491-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0490-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0491-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0491-Fix-some-rails-connecting-improperly.patch b/patches/server/0492-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0491-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0492-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0492-Incremental-player-saving.patch b/patches/server/0493-Incremental-player-saving.patch
similarity index 100%
rename from patches/server/0492-Incremental-player-saving.patch
rename to patches/server/0493-Incremental-player-saving.patch
diff --git a/patches/server/0493-Fix-MC-187716-Use-configured-height.patch b/patches/server/0494-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from patches/server/0493-Fix-MC-187716-Use-configured-height.patch
rename to patches/server/0494-Fix-MC-187716-Use-configured-height.patch
diff --git a/patches/server/0494-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0495-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0494-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0495-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0495-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0496-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0495-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0496-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0496-Brand-support.patch b/patches/server/0497-Brand-support.patch
similarity index 100%
rename from patches/server/0496-Brand-support.patch
rename to patches/server/0497-Brand-support.patch
diff --git a/patches/server/0497-Add-setMaxPlayers-API.patch b/patches/server/0498-Add-setMaxPlayers-API.patch
similarity index 100%
rename from patches/server/0497-Add-setMaxPlayers-API.patch
rename to patches/server/0498-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0498-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0499-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0498-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0499-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0499-Don-t-require-FACING-data.patch b/patches/server/0500-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0499-Don-t-require-FACING-data.patch
rename to patches/server/0500-Don-t-require-FACING-data.patch
diff --git a/patches/server/0500-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0501-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0500-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0501-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0501-Add-moon-phase-API.patch b/patches/server/0502-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0501-Add-moon-phase-API.patch
rename to patches/server/0502-Add-moon-phase-API.patch
diff --git a/patches/server/0502-Prevent-headless-pistons-from-being-created.patch b/patches/server/0503-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0502-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0503-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0503-Add-BellRingEvent.patch b/patches/server/0504-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0503-Add-BellRingEvent.patch
rename to patches/server/0504-Add-BellRingEvent.patch
diff --git a/patches/server/0504-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0505-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0504-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0505-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0505-Buffer-joins-to-world.patch b/patches/server/0506-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0505-Buffer-joins-to-world.patch
rename to patches/server/0506-Buffer-joins-to-world.patch
diff --git a/patches/server/0506-Optimize-redstone-algorithm.patch b/patches/server/0507-Optimize-redstone-algorithm.patch
similarity index 100%
rename from patches/server/0506-Optimize-redstone-algorithm.patch
rename to patches/server/0507-Optimize-redstone-algorithm.patch
diff --git a/patches/server/0507-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0508-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0507-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0508-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0508-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0509-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0508-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0509-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0509-Fix-CraftTeam-null-check.patch b/patches/server/0510-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0509-Fix-CraftTeam-null-check.patch
rename to patches/server/0510-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0510-Add-more-Evoker-API.patch b/patches/server/0511-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0510-Add-more-Evoker-API.patch
rename to patches/server/0511-Add-more-Evoker-API.patch
diff --git a/patches/server/0511-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/server/0512-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from patches/server/0511-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to patches/server/0512-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/patches/server/0512-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0513-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0512-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0513-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0513-Cache-block-data-strings.patch b/patches/server/0514-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0513-Cache-block-data-strings.patch
rename to patches/server/0514-Cache-block-data-strings.patch
diff --git a/patches/server/0514-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0515-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0514-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0515-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0515-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0516-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0515-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0516-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0516-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0517-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0516-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0517-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0517-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0518-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0517-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0518-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0518-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0519-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from patches/server/0518-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0519-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0519-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0520-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0519-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0520-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0520-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0521-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0520-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0521-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0521-Entity-isTicking.patch b/patches/server/0522-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0521-Entity-isTicking.patch
rename to patches/server/0522-Entity-isTicking.patch
diff --git a/patches/server/0522-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0523-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0522-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0523-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0523-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/patches/server/0524-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0523-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
rename to patches/server/0524-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
diff --git a/patches/server/0524-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0525-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0524-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0525-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0525-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0526-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0525-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0526-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0526-Optimise-getType-calls.patch b/patches/server/0527-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0526-Optimise-getType-calls.patch
rename to patches/server/0527-Optimise-getType-calls.patch
diff --git a/patches/server/0527-Villager-resetOffers.patch b/patches/server/0528-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0527-Villager-resetOffers.patch
rename to patches/server/0528-Villager-resetOffers.patch
diff --git a/patches/server/0528-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0529-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0528-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0529-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0529-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0530-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 93%
rename from patches/server/0529-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0530-Retain-block-place-order-when-capturing-blockstates.patch
index 60332ff84..86eaf1f7d 100644
--- a/patches/server/0529-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0530-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
cases where a captured entry is overriden) - but for now this will do.
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b969e7f2087aed5b1f97ce8593a25ada737daec9..31aa0c682fddb0555c2ac47f563484cfa51f2669 100644
+index b92d930448757968cd6a178f4bcafae72c93044c..0c1774ecf236d7616738a170930abe58c5d12ece 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -147,7 +147,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0530-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0531-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0530-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0531-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0531-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0532-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0531-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0532-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0532-Player-elytra-boost-API.patch b/patches/server/0533-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0532-Player-elytra-boost-API.patch
rename to patches/server/0533-Player-elytra-boost-API.patch
diff --git a/patches/server/0533-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0534-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0533-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0534-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0534-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0535-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0534-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0535-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0535-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0536-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0535-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0536-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0536-Add-ignore-discounts-API.patch b/patches/server/0537-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0536-Add-ignore-discounts-API.patch
rename to patches/server/0537-Add-ignore-discounts-API.patch
diff --git a/patches/server/0537-Toggle-for-removing-existing-dragon.patch b/patches/server/0538-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0537-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0538-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0538-Fix-client-lag-on-advancement-loading.patch b/patches/server/0539-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0538-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0539-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0539-Item-no-age-no-player-pickup.patch b/patches/server/0540-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0539-Item-no-age-no-player-pickup.patch
rename to patches/server/0540-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0541-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0541-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0541-Beacon-API-custom-effect-ranges.patch b/patches/server/0542-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0541-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0542-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0542-Add-API-for-quit-reason.patch b/patches/server/0543-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0542-Add-API-for-quit-reason.patch
rename to patches/server/0543-Add-API-for-quit-reason.patch
diff --git a/patches/server/0543-Seed-based-feature-search.patch b/patches/server/0544-Seed-based-feature-search.patch
similarity index 100%
rename from patches/server/0543-Seed-based-feature-search.patch
rename to patches/server/0544-Seed-based-feature-search.patch
diff --git a/patches/server/0544-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0545-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0544-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0545-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0545-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0546-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0545-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0546-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0546-Expose-world-spawn-angle.patch b/patches/server/0547-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0546-Expose-world-spawn-angle.patch
rename to patches/server/0547-Expose-world-spawn-angle.patch
diff --git a/patches/server/0547-Add-Destroy-Speed-API.patch b/patches/server/0548-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0547-Add-Destroy-Speed-API.patch
rename to patches/server/0548-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0548-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0549-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0548-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0549-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0549-Add-LivingEntity-clearActiveItem.patch b/patches/server/0550-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0549-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0550-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0550-Add-PlayerItemCooldownEvent.patch b/patches/server/0551-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0550-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0551-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0551-More-lightning-API.patch b/patches/server/0552-More-lightning-API.patch
similarity index 100%
rename from patches/server/0551-More-lightning-API.patch
rename to patches/server/0552-More-lightning-API.patch
diff --git a/patches/server/0552-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0553-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0552-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0553-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0553-Added-missing-default-perms-for-commands.patch b/patches/server/0554-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0553-Added-missing-default-perms-for-commands.patch
rename to patches/server/0554-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0554-Add-PlayerShearBlockEvent.patch b/patches/server/0555-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0554-Add-PlayerShearBlockEvent.patch
rename to patches/server/0555-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0555-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0556-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0555-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0556-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0556-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0557-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0556-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0557-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0557-Limit-recipe-packets.patch b/patches/server/0558-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0557-Limit-recipe-packets.patch
rename to patches/server/0558-Limit-recipe-packets.patch
diff --git a/patches/server/0558-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0559-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0558-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0559-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0559-MC-4-Fix-item-position-desync.patch b/patches/server/0560-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0559-MC-4-Fix-item-position-desync.patch
rename to patches/server/0560-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0560-Player-Chunk-Load-Unload-Events.patch b/patches/server/0561-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0560-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0561-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0561-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0562-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0561-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0562-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0562-Expose-LivingEntity-hurt-direction.patch b/patches/server/0563-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0562-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0563-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0563-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0564-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0563-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0564-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0564-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0565-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0564-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0565-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0565-added-PlayerTradeEvent.patch b/patches/server/0566-added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/server/0565-added-PlayerTradeEvent.patch
rename to patches/server/0566-added-PlayerTradeEvent.patch
diff --git a/patches/server/0566-Implement-TargetHitEvent.patch b/patches/server/0567-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0566-Implement-TargetHitEvent.patch
rename to patches/server/0567-Implement-TargetHitEvent.patch
diff --git a/patches/server/0567-Additional-Block-Material-API-s.patch b/patches/server/0568-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0567-Additional-Block-Material-API-s.patch
rename to patches/server/0568-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0568-Fix-harming-potion-dupe.patch b/patches/server/0569-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0568-Fix-harming-potion-dupe.patch
rename to patches/server/0569-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0569-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0570-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0569-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0570-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0570-Cache-burn-durations.patch b/patches/server/0571-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0570-Cache-burn-durations.patch
rename to patches/server/0571-Cache-burn-durations.patch
diff --git a/patches/server/0571-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0572-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0571-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0572-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0572-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0573-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0572-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0573-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0573-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0574-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0573-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0574-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0574-Zombie-API-breaking-doors.patch b/patches/server/0575-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0574-Zombie-API-breaking-doors.patch
rename to patches/server/0575-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0575-Fix-nerfed-slime-when-splitting.patch b/patches/server/0576-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0575-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0576-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0576-Add-EntityLoadCrossbowEvent.patch b/patches/server/0577-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0576-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0577-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0577-Guardian-beam-workaround.patch b/patches/server/0578-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0577-Guardian-beam-workaround.patch
rename to patches/server/0578-Guardian-beam-workaround.patch
diff --git a/patches/server/0578-Added-WorldGameRuleChangeEvent.patch b/patches/server/0579-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0578-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0579-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0579-Added-ServerResourcesReloadedEvent.patch b/patches/server/0580-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0579-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0580-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0580-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0581-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0580-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0581-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0581-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0582-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0581-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0582-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0582-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0583-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0582-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0583-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0583-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0584-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0583-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0584-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0584-Configurable-door-breaking-difficulty.patch b/patches/server/0585-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0584-Configurable-door-breaking-difficulty.patch
rename to patches/server/0585-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0585-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0586-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0585-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0586-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0586-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0587-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0586-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0587-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0587-Remove-stale-POIs.patch b/patches/server/0588-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0587-Remove-stale-POIs.patch
rename to patches/server/0588-Remove-stale-POIs.patch
diff --git a/patches/server/0588-Fix-villager-boat-exploit.patch b/patches/server/0589-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0588-Fix-villager-boat-exploit.patch
rename to patches/server/0589-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0589-Add-sendOpLevel-API.patch b/patches/server/0590-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0589-Add-sendOpLevel-API.patch
rename to patches/server/0590-Add-sendOpLevel-API.patch
diff --git a/patches/server/0590-Add-StructureLocateEvent.patch b/patches/server/0591-Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/server/0590-Add-StructureLocateEvent.patch
rename to patches/server/0591-Add-StructureLocateEvent.patch
diff --git a/patches/server/0591-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0592-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0591-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0592-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0592-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0593-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0592-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0593-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0593-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0594-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0593-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0594-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0594-Make-schedule-command-per-world.patch b/patches/server/0595-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0594-Make-schedule-command-per-world.patch
rename to patches/server/0595-Make-schedule-command-per-world.patch
diff --git a/patches/server/0595-Configurable-max-leash-distance.patch b/patches/server/0596-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0595-Configurable-max-leash-distance.patch
rename to patches/server/0596-Configurable-max-leash-distance.patch
diff --git a/patches/server/0596-Implement-BlockPreDispenseEvent.patch b/patches/server/0597-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0596-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0597-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0597-Added-Vanilla-Entity-Tags.patch b/patches/server/0598-Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from patches/server/0597-Added-Vanilla-Entity-Tags.patch
rename to patches/server/0598-Added-Vanilla-Entity-Tags.patch
diff --git a/patches/server/0598-added-Wither-API.patch b/patches/server/0599-added-Wither-API.patch
similarity index 100%
rename from patches/server/0598-added-Wither-API.patch
rename to patches/server/0599-added-Wither-API.patch
diff --git a/patches/server/0599-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0600-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0599-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0600-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0600-Fix-console-spam-when-removing-chests-in-water.patch b/patches/server/0601-Fix-console-spam-when-removing-chests-in-water.patch
similarity index 100%
rename from patches/server/0600-Fix-console-spam-when-removing-chests-in-water.patch
rename to patches/server/0601-Fix-console-spam-when-removing-chests-in-water.patch
diff --git a/patches/server/0601-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0602-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0601-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0602-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0602-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0603-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0602-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0603-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0603-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0604-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0603-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0604-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0604-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0605-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 100%
rename from patches/server/0604-Skip-distance-map-update-when-spawning-disabled.patch
rename to patches/server/0605-Skip-distance-map-update-when-spawning-disabled.patch
diff --git a/patches/server/0605-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0606-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0605-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0606-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0606-add-DragonEggFormEvent.patch b/patches/server/0607-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0606-add-DragonEggFormEvent.patch
rename to patches/server/0607-add-DragonEggFormEvent.patch
diff --git a/patches/server/0607-EntityMoveEvent.patch b/patches/server/0608-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0607-EntityMoveEvent.patch
rename to patches/server/0608-EntityMoveEvent.patch
diff --git a/patches/server/0608-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0609-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0608-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0609-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0609-Inline-shift-direction-fields.patch b/patches/server/0610-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0609-Inline-shift-direction-fields.patch
rename to patches/server/0610-Inline-shift-direction-fields.patch
diff --git a/patches/server/0610-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0611-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0610-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0611-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0611-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0612-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0611-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0612-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0612-living-entity-allow-attribute-registration.patch b/patches/server/0613-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0612-living-entity-allow-attribute-registration.patch
rename to patches/server/0613-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0613-fix-dead-slime-setSize-invincibility.patch b/patches/server/0614-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0613-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0614-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0614-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0615-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0614-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0615-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0615-misc-debugging-dumps.patch b/patches/server/0616-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0615-misc-debugging-dumps.patch
rename to patches/server/0616-misc-debugging-dumps.patch
diff --git a/patches/server/0616-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0617-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0616-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0617-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0617-Expose-Tracked-Players.patch b/patches/server/0618-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0617-Expose-Tracked-Players.patch
rename to patches/server/0618-Expose-Tracked-Players.patch
diff --git a/patches/server/0618-Remove-streams-from-SensorNearest.patch b/patches/server/0619-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0618-Remove-streams-from-SensorNearest.patch
rename to patches/server/0619-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0619-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0620-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from patches/server/0619-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to patches/server/0620-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/patches/server/0620-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0621-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0620-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0621-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0621-Improve-ServerGUI.patch b/patches/server/0622-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0621-Improve-ServerGUI.patch
rename to patches/server/0622-Improve-ServerGUI.patch
diff --git a/patches/server/0622-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0623-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0622-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0623-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0623-fix-converting-txt-to-json-file.patch b/patches/server/0624-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0623-fix-converting-txt-to-json-file.patch
rename to patches/server/0624-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0624-Add-worldborder-events.patch b/patches/server/0625-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0624-Add-worldborder-events.patch
rename to patches/server/0625-Add-worldborder-events.patch
diff --git a/patches/server/0625-added-PlayerNameEntityEvent.patch b/patches/server/0626-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0625-added-PlayerNameEntityEvent.patch
rename to patches/server/0626-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0626-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0627-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0626-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0627-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0627-Add-recipe-to-cook-events.patch b/patches/server/0628-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0627-Add-recipe-to-cook-events.patch
rename to patches/server/0628-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0628-Add-Block-isValidTool.patch b/patches/server/0629-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0628-Add-Block-isValidTool.patch
rename to patches/server/0629-Add-Block-isValidTool.patch
diff --git a/patches/server/0629-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0630-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0629-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0630-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0630-Implement-Keyed-on-World.patch b/patches/server/0631-Implement-Keyed-on-World.patch
similarity index 100%
rename from patches/server/0630-Implement-Keyed-on-World.patch
rename to patches/server/0631-Implement-Keyed-on-World.patch
diff --git a/patches/server/0631-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0632-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0631-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0632-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0632-Item-Rarity-API.patch b/patches/server/0633-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0632-Item-Rarity-API.patch
rename to patches/server/0633-Item-Rarity-API.patch
diff --git a/patches/server/0633-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0634-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0633-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0634-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0634-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0635-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0634-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0635-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0635-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0636-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0635-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0636-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0636-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0637-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0636-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0637-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0637-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0638-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0637-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0638-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0638-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0639-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/0638-fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/server/0639-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0639-Expose-protocol-version.patch b/patches/server/0640-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0639-Expose-protocol-version.patch
rename to patches/server/0640-Expose-protocol-version.patch
diff --git a/patches/server/0640-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0641-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from patches/server/0640-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0641-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0641-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0642-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0641-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0642-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0642-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0643-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0642-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0643-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0643-Add-bypass-host-check.patch b/patches/server/0644-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0643-Add-bypass-host-check.patch
rename to patches/server/0644-Add-bypass-host-check.patch
diff --git a/patches/server/0644-Set-area-affect-cloud-rotation.patch b/patches/server/0645-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0644-Set-area-affect-cloud-rotation.patch
rename to patches/server/0645-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0645-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0646-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0645-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0646-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0646-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0647-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from patches/server/0646-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/server/0647-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0647-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0648-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0647-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0648-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0648-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0649-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0648-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0649-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0649-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0650-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0649-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0650-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0650-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0651-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0650-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0651-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0651-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0652-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0651-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0652-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0652-Added-PlayerDeepSleepEvent.patch b/patches/server/0653-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0652-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0653-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0653-More-World-API.patch b/patches/server/0654-More-World-API.patch
similarity index 100%
rename from patches/server/0653-More-World-API.patch
rename to patches/server/0654-More-World-API.patch
diff --git a/patches/server/0654-Added-PlayerBedFailEnterEvent.patch b/patches/server/0655-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0654-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0655-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0655-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0656-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0655-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0656-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0656-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0657-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0656-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0657-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0657-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0658-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0657-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0658-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0658-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0659-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0658-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0659-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0659-Add-Channel-initialization-listeners.patch b/patches/server/0660-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0659-Add-Channel-initialization-listeners.patch
rename to patches/server/0660-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0660-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0661-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0660-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0661-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0661-Add-more-WanderingTrader-API.patch b/patches/server/0662-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0661-Add-more-WanderingTrader-API.patch
rename to patches/server/0662-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0662-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0663-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0662-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0663-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0663-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0664-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0663-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0664-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0664-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0665-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0664-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0665-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0665-Inventory-close.patch b/patches/server/0666-Inventory-close.patch
similarity index 100%
rename from patches/server/0665-Inventory-close.patch
rename to patches/server/0666-Inventory-close.patch
diff --git a/patches/server/0666-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0667-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/server/0666-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0667-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0667-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0668-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0667-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0668-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0668-Fix-CraftPotionBrewer-cache.patch b/patches/server/0669-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0668-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0669-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0669-Add-basic-Datapack-API.patch b/patches/server/0670-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0669-Add-basic-Datapack-API.patch
rename to patches/server/0670-Add-basic-Datapack-API.patch
diff --git a/patches/server/0670-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0671-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0670-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0671-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0671-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0672-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0671-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0672-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0672-ItemStack-repair-check-API.patch b/patches/server/0673-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0672-ItemStack-repair-check-API.patch
rename to patches/server/0673-ItemStack-repair-check-API.patch
diff --git a/patches/server/0673-More-Enchantment-API.patch b/patches/server/0674-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0673-More-Enchantment-API.patch
rename to patches/server/0674-More-Enchantment-API.patch
diff --git a/patches/server/0674-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0675-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/server/0674-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0675-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0675-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0676-Fix-and-optimise-world-force-upgrading.patch
similarity index 99%
rename from patches/server/0675-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0676-Fix-and-optimise-world-force-upgrading.patch
index ac29e5ed6..8c5f11e07 100644
--- a/patches/server/0675-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0676-Fix-and-optimise-world-force-upgrading.patch
@@ -297,7 +297,7 @@ index 73ac55de9059a1d0f1da5bec0688dcd4bf5c8973..db2d6e7b2dc82c60d524dd2a018d28c2
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 31aa0c682fddb0555c2ac47f563484cfa51f2669..ad2d5b19ef23677dd6192b049fca42b9cec392a1 100644
+index 0c1774ecf236d7616738a170930abe58c5d12ece..667aecc27e0c886f15a0418020d046e0a9791a0e 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -185,6 +185,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0676-Add-Mob-lookAt-API.patch b/patches/server/0677-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0676-Add-Mob-lookAt-API.patch
rename to patches/server/0677-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0677-Add-Unix-domain-socket-support.patch b/patches/server/0678-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0677-Add-Unix-domain-socket-support.patch
rename to patches/server/0678-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0678-Add-EntityInsideBlockEvent.patch b/patches/server/0679-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0678-Add-EntityInsideBlockEvent.patch
rename to patches/server/0679-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0679-Attributes-API-for-item-defaults.patch b/patches/server/0680-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0679-Attributes-API-for-item-defaults.patch
rename to patches/server/0680-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0680-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0681-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0680-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
rename to patches/server/0681-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
diff --git a/patches/server/0681-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0682-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0681-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0682-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0682-More-Lidded-Block-API.patch b/patches/server/0683-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0682-More-Lidded-Block-API.patch
rename to patches/server/0683-More-Lidded-Block-API.patch
diff --git a/patches/server/0683-Limit-item-frame-cursors-on-maps.patch b/patches/server/0684-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0683-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0684-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0684-Add-PufferFishStateChangeEvent.patch b/patches/server/0685-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0684-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0685-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0685-Add-PlayerKickEvent-causes.patch b/patches/server/0686-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0685-Add-PlayerKickEvent-causes.patch
rename to patches/server/0686-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0686-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0687-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0686-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0687-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0687-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0688-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 100%
rename from patches/server/0687-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/server/0688-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0688-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0689-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0688-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0689-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0689-Add-BellRevealRaiderEvent.patch b/patches/server/0690-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0689-Add-BellRevealRaiderEvent.patch
rename to patches/server/0690-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0690-Fix-invulnerable-end-crystals.patch b/patches/server/0691-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0690-Fix-invulnerable-end-crystals.patch
rename to patches/server/0691-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0691-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0692-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0691-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0692-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0692-Reset-villager-inventory-on-cancelled-pickup-event.patch b/patches/server/0693-Reset-villager-inventory-on-cancelled-pickup-event.patch
similarity index 100%
rename from patches/server/0692-Reset-villager-inventory-on-cancelled-pickup-event.patch
rename to patches/server/0693-Reset-villager-inventory-on-cancelled-pickup-event.patch
diff --git a/patches/server/0693-Fix-dangerous-end-portal-logic.patch b/patches/server/0694-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0693-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0694-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0694-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0695-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0694-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0695-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0695-Make-item-validations-configurable.patch b/patches/server/0696-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0695-Make-item-validations-configurable.patch
rename to patches/server/0696-Make-item-validations-configurable.patch
diff --git a/patches/server/0696-Add-more-line-of-sight-methods.patch b/patches/server/0697-Add-more-line-of-sight-methods.patch
similarity index 100%
rename from patches/server/0696-Add-more-line-of-sight-methods.patch
rename to patches/server/0697-Add-more-line-of-sight-methods.patch
diff --git a/patches/server/0697-add-per-world-spawn-limits.patch b/patches/server/0698-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0697-add-per-world-spawn-limits.patch
rename to patches/server/0698-add-per-world-spawn-limits.patch
diff --git a/patches/server/0698-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0699-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0698-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0699-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0699-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0700-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
similarity index 100%
rename from patches/server/0699-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
rename to patches/server/0700-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch