diff --git a/Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch
index 991108f14..98f5997ec 100644
--- a/Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch
+++ b/Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch
@@ -18,10 +18,18 @@ index 6e5d21af43261dc2f12ceec7b7e3269be635cf7a..ecf4cd6dfea777ab9daea0b40724d247
          boolean flag1 = this.playerChunkMap.b();
  
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index eaeac60b2d54d8e7d298ea412d888471a7ea9e79..2ca9335129465ffb67617b42534db530c1d78923 100644
+index eaeac60b2d54d8e7d298ea412d888471a7ea9e79..36b4792687a5c6316bf95995e761bf4aa49779f6 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -174,6 +174,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -31,6 +31,7 @@ import net.minecraft.core.NonNullList;
+ import net.minecraft.core.SectionPosition;
+ import net.minecraft.nbt.DynamicOpsNBT;
+ import net.minecraft.nbt.NBTTagCompound;
++import net.minecraft.network.NetworkManager;
+ import net.minecraft.network.chat.ChatComponentText;
+ import net.minecraft.network.chat.ChatHoverable;
+ import net.minecraft.network.chat.ChatMessage;
+@@ -174,6 +175,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      private static final Logger LOGGER = LogManager.getLogger();
      public PlayerConnection playerConnection;
@@ -29,7 +37,7 @@ index eaeac60b2d54d8e7d298ea412d888471a7ea9e79..2ca9335129465ffb67617b42534db530
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
      public final Deque<Integer> removeQueue = new ArrayDeque<>(); // Paper
-@@ -240,6 +241,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -240,6 +242,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public boolean joining = true;
      public boolean sentListPacket = false;
      public boolean supressTrackerForLogin = false; // Paper
diff --git a/Spigot-Server-Patches/0455-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from Spigot-Server-Patches/0455-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to Spigot-Server-Patches/0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/Spigot-Server-Patches/0454-fixup-Load-chunks-asynchronously-for-players.patch b/Spigot-Server-Patches/0454-fixup-Load-chunks-asynchronously-for-players.patch
deleted file mode 100644
index 431628043..000000000
--- a/Spigot-Server-Patches/0454-fixup-Load-chunks-asynchronously-for-players.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Tue, 16 Mar 2021 11:25:11 +0100
-Subject: [PATCH] fixup! Load chunks asynchronously for players.
-
-
-diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 2ca9335129465ffb67617b42534db530c1d78923..36b4792687a5c6316bf95995e761bf4aa49779f6 100644
---- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -31,6 +31,7 @@ import net.minecraft.core.NonNullList;
- import net.minecraft.core.SectionPosition;
- import net.minecraft.nbt.DynamicOpsNBT;
- import net.minecraft.nbt.NBTTagCompound;
-+import net.minecraft.network.NetworkManager;
- import net.minecraft.network.chat.ChatComponentText;
- import net.minecraft.network.chat.ChatHoverable;
- import net.minecraft.network.chat.ChatMessage;
diff --git a/Spigot-Server-Patches/0456-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0455-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0456-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to Spigot-Server-Patches/0455-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/Spigot-Server-Patches/0457-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 100%
rename from Spigot-Server-Patches/0457-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to Spigot-Server-Patches/0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
diff --git a/Spigot-Server-Patches/0458-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0457-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from Spigot-Server-Patches/0458-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to Spigot-Server-Patches/0457-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/Spigot-Server-Patches/0459-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0458-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from Spigot-Server-Patches/0459-Add-phantom-creative-and-insomniac-controls.patch
rename to Spigot-Server-Patches/0458-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/Spigot-Server-Patches/0460-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from Spigot-Server-Patches/0460-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to Spigot-Server-Patches/0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/Spigot-Server-Patches/0461-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0461-Implement-Brigadier-Mojang-API.patch
rename to Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch
diff --git a/Spigot-Server-Patches/0462-Villager-Restocks-API.patch b/Spigot-Server-Patches/0461-Villager-Restocks-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0462-Villager-Restocks-API.patch
rename to Spigot-Server-Patches/0461-Villager-Restocks-API.patch
diff --git a/Spigot-Server-Patches/0463-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0463-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/Spigot-Server-Patches/0464-Expose-game-version.patch b/Spigot-Server-Patches/0463-Expose-game-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0464-Expose-game-version.patch
rename to Spigot-Server-Patches/0463-Expose-game-version.patch
diff --git a/Spigot-Server-Patches/0465-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0464-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from Spigot-Server-Patches/0465-Optimize-Voxel-Shape-Merging.patch
rename to Spigot-Server-Patches/0464-Optimize-Voxel-Shape-Merging.patch
diff --git a/Spigot-Server-Patches/0466-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 93%
rename from Spigot-Server-Patches/0466-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to Spigot-Server-Patches/0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 313ecce14..8569184c6 100644
--- a/Spigot-Server-Patches/0466-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/Spigot-Server-Patches/0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 2a36de929e6d433b0f67f0a901c03c624cd41e17..af1b93beee1cf4ea1be356eb47ef9a3c8d0f2837 100644
+index 3348d0466e340acc8f143ec98a4b26f23939d8a7..23389d0a0e7bd8aeb2f1ab0ea6a149ef99e800fb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -22,6 +22,7 @@ public class Main {
diff --git a/Spigot-Server-Patches/0467-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0467-Implement-Mob-Goal-API.patch
rename to Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
index 6f6e3373f..a5404c116 100644
--- a/Spigot-Server-Patches/0467-Implement-Mob-Goal-API.patch
+++ b/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/pom.xml b/pom.xml
-index d6e313021d268c5d865394859b3d748edf1b061c..70c0fb4621b16c33d7cdf7d920c17bfe1ff8d831 100644
+index 14e66414d043ce720b8fd7bfa2c476d8369c757b..25ec9c4f8c08551fd80a597a1b39854e70e4f895 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -142,6 +142,13 @@
diff --git a/Spigot-Server-Patches/0468-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0467-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from Spigot-Server-Patches/0468-Use-distance-map-to-optimise-entity-tracker.patch
rename to Spigot-Server-Patches/0467-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/Spigot-Server-Patches/0469-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 100%
rename from Spigot-Server-Patches/0469-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch
diff --git a/Spigot-Server-Patches/0470-Stop-copy-on-write-operations-for-updating-light-dat.patch b/Spigot-Server-Patches/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from Spigot-Server-Patches/0470-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to Spigot-Server-Patches/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/Spigot-Server-Patches/0471-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch
similarity index 100%
rename from Spigot-Server-Patches/0471-No-Tick-view-distance-implementation.patch
rename to Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch
diff --git a/Spigot-Server-Patches/0472-Add-villager-reputation-API.patch b/Spigot-Server-Patches/0471-Add-villager-reputation-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0472-Add-villager-reputation-API.patch
rename to Spigot-Server-Patches/0471-Add-villager-reputation-API.patch
diff --git a/Spigot-Server-Patches/0473-Fix-Light-Command.patch b/Spigot-Server-Patches/0472-Fix-Light-Command.patch
similarity index 100%
rename from Spigot-Server-Patches/0473-Fix-Light-Command.patch
rename to Spigot-Server-Patches/0472-Fix-Light-Command.patch
diff --git a/Spigot-Server-Patches/0474-Fix-PotionEffect-ignores-icon-flag.patch b/Spigot-Server-Patches/0473-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0474-Fix-PotionEffect-ignores-icon-flag.patch
rename to Spigot-Server-Patches/0473-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/Spigot-Server-Patches/0475-Optimize-brigadier-child-sorting-performance.patch b/Spigot-Server-Patches/0474-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from Spigot-Server-Patches/0475-Optimize-brigadier-child-sorting-performance.patch
rename to Spigot-Server-Patches/0474-Optimize-brigadier-child-sorting-performance.patch
diff --git a/Spigot-Server-Patches/0476-Potential-bed-API.patch b/Spigot-Server-Patches/0475-Potential-bed-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0476-Potential-bed-API.patch
rename to Spigot-Server-Patches/0475-Potential-bed-API.patch
diff --git a/Spigot-Server-Patches/0477-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0477-Wait-for-Async-Tasks-during-shutdown.patch
rename to Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/Spigot-Server-Patches/0478-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/Spigot-Server-Patches/0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from Spigot-Server-Patches/0478-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to Spigot-Server-Patches/0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/Spigot-Server-Patches/0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from Spigot-Server-Patches/0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/Spigot-Server-Patches/0480-Optimize-NibbleArray-to-use-pooled-buffers.patch b/Spigot-Server-Patches/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from Spigot-Server-Patches/0480-Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to Spigot-Server-Patches/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/Spigot-Server-Patches/0481-Reduce-MutableInt-allocations-from-light-engine.patch b/Spigot-Server-Patches/0480-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0481-Reduce-MutableInt-allocations-from-light-engine.patch
rename to Spigot-Server-Patches/0480-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/Spigot-Server-Patches/0482-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/Spigot-Server-Patches/0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from Spigot-Server-Patches/0482-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to Spigot-Server-Patches/0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/Spigot-Server-Patches/0483-Ensure-safe-gateway-teleport.patch b/Spigot-Server-Patches/0482-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from Spigot-Server-Patches/0483-Ensure-safe-gateway-teleport.patch
rename to Spigot-Server-Patches/0482-Ensure-safe-gateway-teleport.patch
diff --git a/Spigot-Server-Patches/0484-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0483-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from Spigot-Server-Patches/0484-Add-option-for-console-having-all-permissions.patch
rename to Spigot-Server-Patches/0483-Add-option-for-console-having-all-permissions.patch
diff --git a/Spigot-Server-Patches/0485-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/Spigot-Server-Patches/0484-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0485-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to Spigot-Server-Patches/0484-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/Spigot-Server-Patches/0486-Workaround-for-Client-Lag-Spikes-MC-162253.patch b/Spigot-Server-Patches/0485-Workaround-for-Client-Lag-Spikes-MC-162253.patch
similarity index 100%
rename from Spigot-Server-Patches/0486-Workaround-for-Client-Lag-Spikes-MC-162253.patch
rename to Spigot-Server-Patches/0485-Workaround-for-Client-Lag-Spikes-MC-162253.patch
diff --git a/Spigot-Server-Patches/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/Spigot-Server-Patches/0488-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 100%
rename from Spigot-Server-Patches/0488-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to Spigot-Server-Patches/0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/Spigot-Server-Patches/0489-Improve-Chunk-Status-Transition-Speed.patch b/Spigot-Server-Patches/0488-Improve-Chunk-Status-Transition-Speed.patch
similarity index 100%
rename from Spigot-Server-Patches/0489-Improve-Chunk-Status-Transition-Speed.patch
rename to Spigot-Server-Patches/0488-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/Spigot-Server-Patches/0490-Fix-villager-trading-demand-MC-163962.patch b/Spigot-Server-Patches/0489-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from Spigot-Server-Patches/0490-Fix-villager-trading-demand-MC-163962.patch
rename to Spigot-Server-Patches/0489-Fix-villager-trading-demand-MC-163962.patch
diff --git a/Spigot-Server-Patches/0491-Maps-shouldn-t-load-chunks.patch b/Spigot-Server-Patches/0490-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0491-Maps-shouldn-t-load-chunks.patch
rename to Spigot-Server-Patches/0490-Maps-shouldn-t-load-chunks.patch
diff --git a/Spigot-Server-Patches/0492-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/Spigot-Server-Patches/0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from Spigot-Server-Patches/0492-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to Spigot-Server-Patches/0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/Spigot-Server-Patches/0493-Optimize-Bit-Operations-by-inlining.patch b/Spigot-Server-Patches/0492-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from Spigot-Server-Patches/0493-Optimize-Bit-Operations-by-inlining.patch
rename to Spigot-Server-Patches/0492-Optimize-Bit-Operations-by-inlining.patch
diff --git a/Spigot-Server-Patches/0494-Optimize-Light-Engine.patch b/Spigot-Server-Patches/0493-Optimize-Light-Engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0494-Optimize-Light-Engine.patch
rename to Spigot-Server-Patches/0493-Optimize-Light-Engine.patch
diff --git a/Spigot-Server-Patches/0495-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from Spigot-Server-Patches/0495-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/Spigot-Server-Patches/0496-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0496-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/Spigot-Server-Patches/0497-Fix-missing-chunks-due-to-integer-overflow.patch b/Spigot-Server-Patches/0496-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from Spigot-Server-Patches/0497-Fix-missing-chunks-due-to-integer-overflow.patch
rename to Spigot-Server-Patches/0496-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/Spigot-Server-Patches/0498-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/Spigot-Server-Patches/0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from Spigot-Server-Patches/0498-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to Spigot-Server-Patches/0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/Spigot-Server-Patches/0499-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0498-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from Spigot-Server-Patches/0499-Fix-piston-physics-inconsistency-MC-188840.patch
rename to Spigot-Server-Patches/0498-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/Spigot-Server-Patches/0500-Fix-sand-duping.patch b/Spigot-Server-Patches/0499-Fix-sand-duping.patch
similarity index 100%
rename from Spigot-Server-Patches/0500-Fix-sand-duping.patch
rename to Spigot-Server-Patches/0499-Fix-sand-duping.patch
diff --git a/Spigot-Server-Patches/0501-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from Spigot-Server-Patches/0501-Prevent-position-desync-in-playerconnection-causing-.patch
rename to Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/Spigot-Server-Patches/0502-Fix-enderdragon-exp-dupe.patch b/Spigot-Server-Patches/0501-Fix-enderdragon-exp-dupe.patch
similarity index 100%
rename from Spigot-Server-Patches/0502-Fix-enderdragon-exp-dupe.patch
rename to Spigot-Server-Patches/0501-Fix-enderdragon-exp-dupe.patch
diff --git a/Spigot-Server-Patches/0503-Inventory-getHolder-method-without-block-snapshot.patch b/Spigot-Server-Patches/0502-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from Spigot-Server-Patches/0503-Inventory-getHolder-method-without-block-snapshot.patch
rename to Spigot-Server-Patches/0502-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/Spigot-Server-Patches/0504-Expose-Arrow-getItemStack.patch b/Spigot-Server-Patches/0503-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from Spigot-Server-Patches/0504-Expose-Arrow-getItemStack.patch
rename to Spigot-Server-Patches/0503-Expose-Arrow-getItemStack.patch
diff --git a/Spigot-Server-Patches/0505-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0505-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/Spigot-Server-Patches/0506-Hide-sync-chunk-writes-behind-flag.patch b/Spigot-Server-Patches/0505-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0506-Hide-sync-chunk-writes-behind-flag.patch
rename to Spigot-Server-Patches/0505-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/Spigot-Server-Patches/0507-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0506-Limit-lightning-strike-effect-distance.patch
similarity index 100%
rename from Spigot-Server-Patches/0507-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0506-Limit-lightning-strike-effect-distance.patch
diff --git a/Spigot-Server-Patches/0508-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch
similarity index 100%
rename from Spigot-Server-Patches/0508-Add-permission-for-command-blocks.patch
rename to Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch
diff --git a/Spigot-Server-Patches/0509-Ensure-Entity-AABB-s-are-never-invalid.patch b/Spigot-Server-Patches/0508-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0509-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to Spigot-Server-Patches/0508-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/Spigot-Server-Patches/0510-Optimize-WorldBorder-collision-checks-and-air.patch b/Spigot-Server-Patches/0509-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0510-Optimize-WorldBorder-collision-checks-and-air.patch
rename to Spigot-Server-Patches/0509-Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/Spigot-Server-Patches/0511-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from Spigot-Server-Patches/0511-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/Spigot-Server-Patches/0512-Paper-dumpitem-command.patch b/Spigot-Server-Patches/0511-Paper-dumpitem-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0512-Paper-dumpitem-command.patch
rename to Spigot-Server-Patches/0511-Paper-dumpitem-command.patch
diff --git a/Spigot-Server-Patches/0513-Don-t-allow-null-UUID-s-for-chat.patch b/Spigot-Server-Patches/0512-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from Spigot-Server-Patches/0513-Don-t-allow-null-UUID-s-for-chat.patch
rename to Spigot-Server-Patches/0512-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/Spigot-Server-Patches/0514-Improve-Legacy-Component-serialization-size.patch b/Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from Spigot-Server-Patches/0514-Improve-Legacy-Component-serialization-size.patch
rename to Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch
diff --git a/Spigot-Server-Patches/0515-Support-old-UUID-format-for-NBT.patch b/Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from Spigot-Server-Patches/0515-Support-old-UUID-format-for-NBT.patch
rename to Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch
diff --git a/Spigot-Server-Patches/0516-Clean-up-duplicated-GameProfile-Properties.patch b/Spigot-Server-Patches/0515-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from Spigot-Server-Patches/0516-Clean-up-duplicated-GameProfile-Properties.patch
rename to Spigot-Server-Patches/0515-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/Spigot-Server-Patches/0517-Convert-legacy-attributes-in-Item-Meta.patch b/Spigot-Server-Patches/0516-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from Spigot-Server-Patches/0517-Convert-legacy-attributes-in-Item-Meta.patch
rename to Spigot-Server-Patches/0516-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/Spigot-Server-Patches/0518-Remove-some-streams-from-structures.patch b/Spigot-Server-Patches/0517-Remove-some-streams-from-structures.patch
similarity index 100%
rename from Spigot-Server-Patches/0518-Remove-some-streams-from-structures.patch
rename to Spigot-Server-Patches/0517-Remove-some-streams-from-structures.patch
diff --git a/Spigot-Server-Patches/0519-Remove-streams-from-classes-related-villager-gossip.patch b/Spigot-Server-Patches/0518-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from Spigot-Server-Patches/0519-Remove-streams-from-classes-related-villager-gossip.patch
rename to Spigot-Server-Patches/0518-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/Spigot-Server-Patches/0520-Support-components-in-ItemMeta.patch b/Spigot-Server-Patches/0519-Support-components-in-ItemMeta.patch
similarity index 100%
rename from Spigot-Server-Patches/0520-Support-components-in-ItemMeta.patch
rename to Spigot-Server-Patches/0519-Support-components-in-ItemMeta.patch
diff --git a/Spigot-Server-Patches/0521-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/Spigot-Server-Patches/0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from Spigot-Server-Patches/0521-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to Spigot-Server-Patches/0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/Spigot-Server-Patches/0522-Add-entity-liquid-API.patch b/Spigot-Server-Patches/0521-Add-entity-liquid-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0522-Add-entity-liquid-API.patch
rename to Spigot-Server-Patches/0521-Add-entity-liquid-API.patch
diff --git a/Spigot-Server-Patches/0523-Update-itemstack-legacy-name-and-lore.patch b/Spigot-Server-Patches/0522-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from Spigot-Server-Patches/0523-Update-itemstack-legacy-name-and-lore.patch
rename to Spigot-Server-Patches/0522-Update-itemstack-legacy-name-and-lore.patch
diff --git a/Spigot-Server-Patches/0524-Spawn-player-in-correct-world-on-login.patch b/Spigot-Server-Patches/0523-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from Spigot-Server-Patches/0524-Spawn-player-in-correct-world-on-login.patch
rename to Spigot-Server-Patches/0523-Spawn-player-in-correct-world-on-login.patch
diff --git a/Spigot-Server-Patches/0525-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0524-Add-PrepareResultEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0525-Add-PrepareResultEvent.patch
rename to Spigot-Server-Patches/0524-Add-PrepareResultEvent.patch
diff --git a/Spigot-Server-Patches/0526-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from Spigot-Server-Patches/0526-Allow-delegation-to-vanilla-chunk-gen.patch
rename to Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/Spigot-Server-Patches/0527-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from Spigot-Server-Patches/0527-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/Spigot-Server-Patches/0528-Optimize-NetworkManager-Exception-Handling.patch b/Spigot-Server-Patches/0527-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from Spigot-Server-Patches/0528-Optimize-NetworkManager-Exception-Handling.patch
rename to Spigot-Server-Patches/0527-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/Spigot-Server-Patches/0529-Fix-Concurrency-issue-in-WeightedList.patch b/Spigot-Server-Patches/0528-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from Spigot-Server-Patches/0529-Fix-Concurrency-issue-in-WeightedList.patch
rename to Spigot-Server-Patches/0528-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/Spigot-Server-Patches/0530-Optimize-the-advancement-data-player-iteration-to-be.patch b/Spigot-Server-Patches/0529-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from Spigot-Server-Patches/0530-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to Spigot-Server-Patches/0529-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/Spigot-Server-Patches/0531-Fix-arrows-never-despawning-MC-125757.patch b/Spigot-Server-Patches/0530-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from Spigot-Server-Patches/0531-Fix-arrows-never-despawning-MC-125757.patch
rename to Spigot-Server-Patches/0530-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/Spigot-Server-Patches/0532-Thread-Safe-Vanilla-Command-permission-checking.patch b/Spigot-Server-Patches/0531-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from Spigot-Server-Patches/0532-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to Spigot-Server-Patches/0531-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/Spigot-Server-Patches/0533-Move-range-check-for-block-placing-up.patch b/Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from Spigot-Server-Patches/0533-Move-range-check-for-block-placing-up.patch
rename to Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch
diff --git a/Spigot-Server-Patches/0534-Fix-SPIGOT-5989.patch b/Spigot-Server-Patches/0533-Fix-SPIGOT-5989.patch
similarity index 100%
rename from Spigot-Server-Patches/0534-Fix-SPIGOT-5989.patch
rename to Spigot-Server-Patches/0533-Fix-SPIGOT-5989.patch
diff --git a/Spigot-Server-Patches/0535-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/Spigot-Server-Patches/0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 95%
rename from Spigot-Server-Patches/0535-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to Spigot-Server-Patches/0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index f8679789c..c65973015 100644
--- a/Spigot-Server-Patches/0535-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/Spigot-Server-Patches/0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5824 Bukkit world-container is not used
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index c0f5fdb832115c5a86005e4c3242d9fd7e52f82c..6a15a5f7d3e82f61c0f30bb6a339215376d4867d 100644
+index 1732fc552c290d294b68d6f92f2a58d985fbef21..3dcbeec94d86f3b56eaf05676b176f60d711f9cd 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -132,11 +132,20 @@ public class Main {
diff --git a/Spigot-Server-Patches/0536-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/Spigot-Server-Patches/0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 89%
rename from Spigot-Server-Patches/0536-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to Spigot-Server-Patches/0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index 55ca28c8f..3c64f5348 100644
--- a/Spigot-Server-Patches/0536-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/Spigot-Server-Patches/0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 6a15a5f7d3e82f61c0f30bb6a339215376d4867d..f34d5b214c4726f3b3b96610c1dca3d0d17a09ab 100644
+index 3dcbeec94d86f3b56eaf05676b176f60d711f9cd..6818f8496ab76ee6ffc747bd6848b43830ec8914 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -132,6 +132,7 @@ public class Main {
diff --git a/Spigot-Server-Patches/0537-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/Spigot-Server-Patches/0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from Spigot-Server-Patches/0537-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to Spigot-Server-Patches/0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/Spigot-Server-Patches/0538-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from Spigot-Server-Patches/0538-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/Spigot-Server-Patches/0539-Fix-some-rails-connecting-improperly.patch b/Spigot-Server-Patches/0538-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from Spigot-Server-Patches/0539-Fix-some-rails-connecting-improperly.patch
rename to Spigot-Server-Patches/0538-Fix-some-rails-connecting-improperly.patch
diff --git a/Spigot-Server-Patches/0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/Spigot-Server-Patches/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from Spigot-Server-Patches/0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to Spigot-Server-Patches/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/Spigot-Server-Patches/0541-Incremental-player-saving.patch b/Spigot-Server-Patches/0540-Incremental-player-saving.patch
similarity index 100%
rename from Spigot-Server-Patches/0541-Incremental-player-saving.patch
rename to Spigot-Server-Patches/0540-Incremental-player-saving.patch
diff --git a/Spigot-Server-Patches/0542-Import-fastutil-classes.patch b/Spigot-Server-Patches/0541-Import-fastutil-classes.patch
similarity index 100%
rename from Spigot-Server-Patches/0542-Import-fastutil-classes.patch
rename to Spigot-Server-Patches/0541-Import-fastutil-classes.patch
diff --git a/Spigot-Server-Patches/0543-Don-t-mark-null-chunk-sections-for-block-updates.patch b/Spigot-Server-Patches/0542-Don-t-mark-null-chunk-sections-for-block-updates.patch
similarity index 100%
rename from Spigot-Server-Patches/0543-Don-t-mark-null-chunk-sections-for-block-updates.patch
rename to Spigot-Server-Patches/0542-Don-t-mark-null-chunk-sections-for-block-updates.patch
diff --git a/Spigot-Server-Patches/0544-Remove-armour-stand-double-add-to-world.patch b/Spigot-Server-Patches/0543-Remove-armour-stand-double-add-to-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0544-Remove-armour-stand-double-add-to-world.patch
rename to Spigot-Server-Patches/0543-Remove-armour-stand-double-add-to-world.patch
diff --git a/Spigot-Server-Patches/0545-Fix-MC-187716-Use-configured-height.patch b/Spigot-Server-Patches/0544-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from Spigot-Server-Patches/0545-Fix-MC-187716-Use-configured-height.patch
rename to Spigot-Server-Patches/0544-Fix-MC-187716-Use-configured-height.patch
diff --git a/Spigot-Server-Patches/0546-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/Spigot-Server-Patches/0545-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from Spigot-Server-Patches/0546-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to Spigot-Server-Patches/0545-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/Spigot-Server-Patches/0547-Do-not-let-the-server-load-chunks-from-newer-version.patch b/Spigot-Server-Patches/0546-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0547-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to Spigot-Server-Patches/0546-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/Spigot-Server-Patches/0548-Brand-support.patch b/Spigot-Server-Patches/0547-Brand-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0548-Brand-support.patch
rename to Spigot-Server-Patches/0547-Brand-support.patch
diff --git a/Spigot-Server-Patches/0549-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch b/Spigot-Server-Patches/0548-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
similarity index 100%
rename from Spigot-Server-Patches/0549-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
rename to Spigot-Server-Patches/0548-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
diff --git a/Spigot-Server-Patches/0550-Fix-MC-197271.patch b/Spigot-Server-Patches/0549-Fix-MC-197271.patch
similarity index 100%
rename from Spigot-Server-Patches/0550-Fix-MC-197271.patch
rename to Spigot-Server-Patches/0549-Fix-MC-197271.patch
diff --git a/Spigot-Server-Patches/0551-MC-197883-Bandaid-decode-issue.patch b/Spigot-Server-Patches/0550-MC-197883-Bandaid-decode-issue.patch
similarity index 100%
rename from Spigot-Server-Patches/0551-MC-197883-Bandaid-decode-issue.patch
rename to Spigot-Server-Patches/0550-MC-197883-Bandaid-decode-issue.patch
diff --git a/Spigot-Server-Patches/0552-Add-setMaxPlayers-API.patch b/Spigot-Server-Patches/0551-Add-setMaxPlayers-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0552-Add-setMaxPlayers-API.patch
rename to Spigot-Server-Patches/0551-Add-setMaxPlayers-API.patch
diff --git a/Spigot-Server-Patches/0553-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-Server-Patches/0552-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0553-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to Spigot-Server-Patches/0552-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/Spigot-Server-Patches/0554-Don-t-require-FACING-data.patch b/Spigot-Server-Patches/0553-Don-t-require-FACING-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0554-Don-t-require-FACING-data.patch
rename to Spigot-Server-Patches/0553-Don-t-require-FACING-data.patch
diff --git a/Spigot-Server-Patches/0555-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/Spigot-Server-Patches/0554-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from Spigot-Server-Patches/0555-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to Spigot-Server-Patches/0554-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/Spigot-Server-Patches/0556-Add-moon-phase-API.patch b/Spigot-Server-Patches/0555-Add-moon-phase-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0556-Add-moon-phase-API.patch
rename to Spigot-Server-Patches/0555-Add-moon-phase-API.patch
diff --git a/Spigot-Server-Patches/0557-Prevent-headless-pistons-from-being-created.patch b/Spigot-Server-Patches/0556-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from Spigot-Server-Patches/0557-Prevent-headless-pistons-from-being-created.patch
rename to Spigot-Server-Patches/0556-Prevent-headless-pistons-from-being-created.patch
diff --git a/Spigot-Server-Patches/0558-Add-BellRingEvent.patch b/Spigot-Server-Patches/0557-Add-BellRingEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0558-Add-BellRingEvent.patch
rename to Spigot-Server-Patches/0557-Add-BellRingEvent.patch
diff --git a/Spigot-Server-Patches/0559-Add-zombie-targets-turtle-egg-config.patch b/Spigot-Server-Patches/0558-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from Spigot-Server-Patches/0559-Add-zombie-targets-turtle-egg-config.patch
rename to Spigot-Server-Patches/0558-Add-zombie-targets-turtle-egg-config.patch
diff --git a/Spigot-Server-Patches/0560-Buffer-joins-to-world.patch b/Spigot-Server-Patches/0559-Buffer-joins-to-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0560-Buffer-joins-to-world.patch
rename to Spigot-Server-Patches/0559-Buffer-joins-to-world.patch
diff --git a/Spigot-Server-Patches/0561-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0560-Optimize-redstone-algorithm.patch
similarity index 100%
rename from Spigot-Server-Patches/0561-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0560-Optimize-redstone-algorithm.patch
diff --git a/Spigot-Server-Patches/0562-Fix-hex-colors-not-working-in-some-kick-messages.patch b/Spigot-Server-Patches/0561-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from Spigot-Server-Patches/0562-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to Spigot-Server-Patches/0561-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/Spigot-Server-Patches/0563-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0562-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from Spigot-Server-Patches/0563-PortalCreateEvent-needs-to-know-its-entity.patch
rename to Spigot-Server-Patches/0562-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/Spigot-Server-Patches/0564-Fix-CraftTeam-null-check.patch b/Spigot-Server-Patches/0563-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0564-Fix-CraftTeam-null-check.patch
rename to Spigot-Server-Patches/0563-Fix-CraftTeam-null-check.patch
diff --git a/Spigot-Server-Patches/0565-Add-more-Evoker-API.patch b/Spigot-Server-Patches/0564-Add-more-Evoker-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0565-Add-more-Evoker-API.patch
rename to Spigot-Server-Patches/0564-Add-more-Evoker-API.patch
diff --git a/Spigot-Server-Patches/0566-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from Spigot-Server-Patches/0566-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/Spigot-Server-Patches/0567-Create-HoverEvent-from-ItemStack-Entity.patch b/Spigot-Server-Patches/0566-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from Spigot-Server-Patches/0567-Create-HoverEvent-from-ItemStack-Entity.patch
rename to Spigot-Server-Patches/0566-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/Spigot-Server-Patches/0568-Cache-block-data-strings.patch b/Spigot-Server-Patches/0567-Cache-block-data-strings.patch
similarity index 100%
rename from Spigot-Server-Patches/0568-Cache-block-data-strings.patch
rename to Spigot-Server-Patches/0567-Cache-block-data-strings.patch
diff --git a/Spigot-Server-Patches/0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0568-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from Spigot-Server-Patches/0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to Spigot-Server-Patches/0568-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/Spigot-Server-Patches/0570-Add-additional-open-container-api-to-HumanEntity.patch b/Spigot-Server-Patches/0569-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0570-Add-additional-open-container-api-to-HumanEntity.patch
rename to Spigot-Server-Patches/0569-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/Spigot-Server-Patches/0571-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/Spigot-Server-Patches/0570-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from Spigot-Server-Patches/0571-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to Spigot-Server-Patches/0570-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/Spigot-Server-Patches/0572-Extend-block-drop-capture-to-capture-all-items-added.patch b/Spigot-Server-Patches/0571-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from Spigot-Server-Patches/0572-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to Spigot-Server-Patches/0571-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/Spigot-Server-Patches/0573-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/Spigot-Server-Patches/0572-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from Spigot-Server-Patches/0573-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to Spigot-Server-Patches/0572-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/Spigot-Server-Patches/0574-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/Spigot-Server-Patches/0573-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from Spigot-Server-Patches/0574-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to Spigot-Server-Patches/0573-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/Spigot-Server-Patches/0575-Lazily-track-plugin-scoreboards-by-default.patch b/Spigot-Server-Patches/0574-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from Spigot-Server-Patches/0575-Lazily-track-plugin-scoreboards-by-default.patch
rename to Spigot-Server-Patches/0574-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/Spigot-Server-Patches/0576-Entity-isTicking.patch b/Spigot-Server-Patches/0575-Entity-isTicking.patch
similarity index 100%
rename from Spigot-Server-Patches/0576-Entity-isTicking.patch
rename to Spigot-Server-Patches/0575-Entity-isTicking.patch
diff --git a/Spigot-Server-Patches/0577-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/Spigot-Server-Patches/0576-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from Spigot-Server-Patches/0577-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to Spigot-Server-Patches/0576-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/Spigot-Server-Patches/0578-Fix-Not-a-string-Map-Conversion-spam.patch b/Spigot-Server-Patches/0577-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from Spigot-Server-Patches/0578-Fix-Not-a-string-Map-Conversion-spam.patch
rename to Spigot-Server-Patches/0577-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/Spigot-Server-Patches/0579-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/Spigot-Server-Patches/0578-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0579-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0578-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0580-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch b/Spigot-Server-Patches/0579-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
similarity index 100%
rename from Spigot-Server-Patches/0580-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
rename to Spigot-Server-Patches/0579-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
diff --git a/Spigot-Server-Patches/0581-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/Spigot-Server-Patches/0580-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from Spigot-Server-Patches/0581-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to Spigot-Server-Patches/0580-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/Spigot-Server-Patches/0582-Fix-for-large-move-vectors-crashing-server.patch b/Spigot-Server-Patches/0581-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0582-Fix-for-large-move-vectors-crashing-server.patch
rename to Spigot-Server-Patches/0581-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/Spigot-Server-Patches/0583-Optimise-getType-calls.patch b/Spigot-Server-Patches/0582-Optimise-getType-calls.patch
similarity index 100%
rename from Spigot-Server-Patches/0583-Optimise-getType-calls.patch
rename to Spigot-Server-Patches/0582-Optimise-getType-calls.patch
diff --git a/Spigot-Server-Patches/0584-Villager-resetOffers.patch b/Spigot-Server-Patches/0583-Villager-resetOffers.patch
similarity index 100%
rename from Spigot-Server-Patches/0584-Villager-resetOffers.patch
rename to Spigot-Server-Patches/0583-Villager-resetOffers.patch
diff --git a/Spigot-Server-Patches/0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/Spigot-Server-Patches/0584-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to Spigot-Server-Patches/0584-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch b/Spigot-Server-Patches/0585-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch
rename to Spigot-Server-Patches/0585-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/Spigot-Server-Patches/0587-Reduce-blockpos-allocation-from-pathfinding.patch b/Spigot-Server-Patches/0586-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0587-Reduce-blockpos-allocation-from-pathfinding.patch
rename to Spigot-Server-Patches/0586-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch b/Spigot-Server-Patches/0587-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch
rename to Spigot-Server-Patches/0587-Fix-item-locations-dropped-from-campfires.patch
diff --git a/Spigot-Server-Patches/0589-Player-elytra-boost-API.patch b/Spigot-Server-Patches/0588-Player-elytra-boost-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0589-Player-elytra-boost-API.patch
rename to Spigot-Server-Patches/0588-Player-elytra-boost-API.patch
diff --git a/Spigot-Server-Patches/0590-Fixed-TileEntityBell-memory-leak.patch b/Spigot-Server-Patches/0589-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0590-Fixed-TileEntityBell-memory-leak.patch
rename to Spigot-Server-Patches/0589-Fixed-TileEntityBell-memory-leak.patch
diff --git a/Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/Spigot-Server-Patches/0590-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to Spigot-Server-Patches/0590-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch b/Spigot-Server-Patches/0591-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch
rename to Spigot-Server-Patches/0591-Add-getOfflinePlayerIfCached-String.patch
diff --git a/Spigot-Server-Patches/0593-Add-ignore-discounts-API.patch b/Spigot-Server-Patches/0592-Add-ignore-discounts-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0593-Add-ignore-discounts-API.patch
rename to Spigot-Server-Patches/0592-Add-ignore-discounts-API.patch
diff --git a/Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch b/Spigot-Server-Patches/0593-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch
rename to Spigot-Server-Patches/0593-Toggle-for-removing-existing-dragon.patch
diff --git a/Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch b/Spigot-Server-Patches/0594-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch
rename to Spigot-Server-Patches/0594-Fix-client-lag-on-advancement-loading.patch
diff --git a/Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch b/Spigot-Server-Patches/0595-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch
rename to Spigot-Server-Patches/0595-Item-no-age-no-player-pickup.patch
diff --git a/Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch b/Spigot-Server-Patches/0596-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch
rename to Spigot-Server-Patches/0596-Beacon-API-custom-effect-ranges.patch
diff --git a/Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch b/Spigot-Server-Patches/0597-Add-API-for-quit-reason.patch
similarity index 100%
rename from Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch
rename to Spigot-Server-Patches/0597-Add-API-for-quit-reason.patch
diff --git a/Spigot-Server-Patches/0599-Seed-based-feature-search.patch b/Spigot-Server-Patches/0598-Seed-based-feature-search.patch
similarity index 100%
rename from Spigot-Server-Patches/0599-Seed-based-feature-search.patch
rename to Spigot-Server-Patches/0598-Seed-based-feature-search.patch
diff --git a/Spigot-Server-Patches/0600-Add-Wandering-Trader-spawn-rate-config-options.patch b/Spigot-Server-Patches/0599-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from Spigot-Server-Patches/0600-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to Spigot-Server-Patches/0599-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/Spigot-Server-Patches/0601-Significantly-improve-performance-of-the-end-generat.patch b/Spigot-Server-Patches/0600-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from Spigot-Server-Patches/0601-Significantly-improve-performance-of-the-end-generat.patch
rename to Spigot-Server-Patches/0600-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/Spigot-Server-Patches/0602-Expose-world-spawn-angle.patch b/Spigot-Server-Patches/0601-Expose-world-spawn-angle.patch
similarity index 100%
rename from Spigot-Server-Patches/0602-Expose-world-spawn-angle.patch
rename to Spigot-Server-Patches/0601-Expose-world-spawn-angle.patch
diff --git a/Spigot-Server-Patches/0603-Add-Destroy-Speed-API.patch b/Spigot-Server-Patches/0602-Add-Destroy-Speed-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0603-Add-Destroy-Speed-API.patch
rename to Spigot-Server-Patches/0602-Add-Destroy-Speed-API.patch
diff --git a/Spigot-Server-Patches/0604-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/Spigot-Server-Patches/0603-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from Spigot-Server-Patches/0604-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to Spigot-Server-Patches/0603-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/Spigot-Server-Patches/0605-Add-LivingEntity-clearActiveItem.patch b/Spigot-Server-Patches/0604-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from Spigot-Server-Patches/0605-Add-LivingEntity-clearActiveItem.patch
rename to Spigot-Server-Patches/0604-Add-LivingEntity-clearActiveItem.patch
diff --git a/Spigot-Server-Patches/0606-Add-PlayerItemCooldownEvent.patch b/Spigot-Server-Patches/0605-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0606-Add-PlayerItemCooldownEvent.patch
rename to Spigot-Server-Patches/0605-Add-PlayerItemCooldownEvent.patch
diff --git a/Spigot-Server-Patches/0607-More-lightning-API.patch b/Spigot-Server-Patches/0606-More-lightning-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0607-More-lightning-API.patch
rename to Spigot-Server-Patches/0606-More-lightning-API.patch
diff --git a/Spigot-Server-Patches/0608-Climbing-should-not-bypass-cramming-gamerule.patch b/Spigot-Server-Patches/0607-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from Spigot-Server-Patches/0608-Climbing-should-not-bypass-cramming-gamerule.patch
rename to Spigot-Server-Patches/0607-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/Spigot-Server-Patches/0609-Added-missing-default-perms-for-commands.patch b/Spigot-Server-Patches/0608-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from Spigot-Server-Patches/0609-Added-missing-default-perms-for-commands.patch
rename to Spigot-Server-Patches/0608-Added-missing-default-perms-for-commands.patch
diff --git a/Spigot-Server-Patches/0610-Add-PlayerShearBlockEvent.patch b/Spigot-Server-Patches/0609-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0610-Add-PlayerShearBlockEvent.patch
rename to Spigot-Server-Patches/0609-Add-PlayerShearBlockEvent.patch
diff --git a/Spigot-Server-Patches/0611-Add-warning-for-servers-not-running-on-Java-11.patch b/Spigot-Server-Patches/0610-Add-warning-for-servers-not-running-on-Java-11.patch
similarity index 100%
rename from Spigot-Server-Patches/0611-Add-warning-for-servers-not-running-on-Java-11.patch
rename to Spigot-Server-Patches/0610-Add-warning-for-servers-not-running-on-Java-11.patch
diff --git a/Spigot-Server-Patches/0612-Set-spigots-verbose-world-setting-to-false-by-def.patch b/Spigot-Server-Patches/0611-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from Spigot-Server-Patches/0612-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to Spigot-Server-Patches/0611-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/Spigot-Server-Patches/0613-Fix-curing-zombie-villager-discount-exploit.patch b/Spigot-Server-Patches/0612-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from Spigot-Server-Patches/0613-Fix-curing-zombie-villager-discount-exploit.patch
rename to Spigot-Server-Patches/0612-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/Spigot-Server-Patches/0614-Fix-curing-villager-makes-equipment-disappear.patch b/Spigot-Server-Patches/0613-Fix-curing-villager-makes-equipment-disappear.patch
similarity index 100%
rename from Spigot-Server-Patches/0614-Fix-curing-villager-makes-equipment-disappear.patch
rename to Spigot-Server-Patches/0613-Fix-curing-villager-makes-equipment-disappear.patch
diff --git a/Spigot-Server-Patches/0615-Limit-recipe-packets.patch b/Spigot-Server-Patches/0614-Limit-recipe-packets.patch
similarity index 100%
rename from Spigot-Server-Patches/0615-Limit-recipe-packets.patch
rename to Spigot-Server-Patches/0614-Limit-recipe-packets.patch
diff --git a/Spigot-Server-Patches/0616-Fix-CraftSound-backwards-compatibility.patch b/Spigot-Server-Patches/0615-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from Spigot-Server-Patches/0616-Fix-CraftSound-backwards-compatibility.patch
rename to Spigot-Server-Patches/0615-Fix-CraftSound-backwards-compatibility.patch
diff --git a/Spigot-Server-Patches/0617-MC-4-Fix-item-position-desync.patch b/Spigot-Server-Patches/0616-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from Spigot-Server-Patches/0617-MC-4-Fix-item-position-desync.patch
rename to Spigot-Server-Patches/0616-MC-4-Fix-item-position-desync.patch
diff --git a/Spigot-Server-Patches/0618-Player-Chunk-Load-Unload-Events.patch b/Spigot-Server-Patches/0617-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0618-Player-Chunk-Load-Unload-Events.patch
rename to Spigot-Server-Patches/0617-Player-Chunk-Load-Unload-Events.patch
diff --git a/Spigot-Server-Patches/0619-Optimize-Dynamic-get-Missing-Keys.patch b/Spigot-Server-Patches/0618-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from Spigot-Server-Patches/0619-Optimize-Dynamic-get-Missing-Keys.patch
rename to Spigot-Server-Patches/0618-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/Spigot-Server-Patches/0620-Expose-LivingEntity-hurt-direction.patch b/Spigot-Server-Patches/0619-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from Spigot-Server-Patches/0620-Expose-LivingEntity-hurt-direction.patch
rename to Spigot-Server-Patches/0619-Expose-LivingEntity-hurt-direction.patch
diff --git a/Spigot-Server-Patches/0621-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/Spigot-Server-Patches/0620-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from Spigot-Server-Patches/0621-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to Spigot-Server-Patches/0620-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/Spigot-Server-Patches/0622-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/Spigot-Server-Patches/0621-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from Spigot-Server-Patches/0622-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to Spigot-Server-Patches/0621-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/Spigot-Server-Patches/0623-added-PlayerTradeEvent.patch b/Spigot-Server-Patches/0622-added-PlayerTradeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0623-added-PlayerTradeEvent.patch
rename to Spigot-Server-Patches/0622-added-PlayerTradeEvent.patch
diff --git a/Spigot-Server-Patches/0624-Implement-TargetHitEvent.patch b/Spigot-Server-Patches/0623-Implement-TargetHitEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0624-Implement-TargetHitEvent.patch
rename to Spigot-Server-Patches/0623-Implement-TargetHitEvent.patch
diff --git a/Spigot-Server-Patches/0625-Additional-Block-Material-API-s.patch b/Spigot-Server-Patches/0624-Additional-Block-Material-API-s.patch
similarity index 100%
rename from Spigot-Server-Patches/0625-Additional-Block-Material-API-s.patch
rename to Spigot-Server-Patches/0624-Additional-Block-Material-API-s.patch
diff --git a/Spigot-Server-Patches/0626-Fix-harming-potion-dupe.patch b/Spigot-Server-Patches/0625-Fix-harming-potion-dupe.patch
similarity index 100%
rename from Spigot-Server-Patches/0626-Fix-harming-potion-dupe.patch
rename to Spigot-Server-Patches/0625-Fix-harming-potion-dupe.patch
diff --git a/Spigot-Server-Patches/0627-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/Spigot-Server-Patches/0626-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from Spigot-Server-Patches/0627-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to Spigot-Server-Patches/0626-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/Spigot-Server-Patches/0628-Optimized-tick-ready-check.patch b/Spigot-Server-Patches/0627-Optimized-tick-ready-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0628-Optimized-tick-ready-check.patch
rename to Spigot-Server-Patches/0627-Optimized-tick-ready-check.patch
diff --git a/Spigot-Server-Patches/0629-Cache-burn-durations.patch b/Spigot-Server-Patches/0628-Cache-burn-durations.patch
similarity index 100%
rename from Spigot-Server-Patches/0629-Cache-burn-durations.patch
rename to Spigot-Server-Patches/0628-Cache-burn-durations.patch
diff --git a/Spigot-Server-Patches/0630-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/Spigot-Server-Patches/0629-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from Spigot-Server-Patches/0630-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to Spigot-Server-Patches/0629-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/Spigot-Server-Patches/0631-Implement-PlayerFlowerPotManipulateEvent.patch b/Spigot-Server-Patches/0630-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0631-Implement-PlayerFlowerPotManipulateEvent.patch
rename to Spigot-Server-Patches/0630-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/Spigot-Server-Patches/0632-Fix-interact-event-not-being-called-in-adventure.patch b/Spigot-Server-Patches/0631-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from Spigot-Server-Patches/0632-Fix-interact-event-not-being-called-in-adventure.patch
rename to Spigot-Server-Patches/0631-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/Spigot-Server-Patches/0633-Zombie-API-breaking-doors.patch b/Spigot-Server-Patches/0632-Zombie-API-breaking-doors.patch
similarity index 100%
rename from Spigot-Server-Patches/0633-Zombie-API-breaking-doors.patch
rename to Spigot-Server-Patches/0632-Zombie-API-breaking-doors.patch
diff --git a/Spigot-Server-Patches/0634-Fix-nerfed-slime-when-splitting.patch b/Spigot-Server-Patches/0633-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from Spigot-Server-Patches/0634-Fix-nerfed-slime-when-splitting.patch
rename to Spigot-Server-Patches/0633-Fix-nerfed-slime-when-splitting.patch
diff --git a/Spigot-Server-Patches/0635-Add-EntityLoadCrossbowEvent.patch b/Spigot-Server-Patches/0634-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0635-Add-EntityLoadCrossbowEvent.patch
rename to Spigot-Server-Patches/0634-Add-EntityLoadCrossbowEvent.patch
diff --git a/Spigot-Server-Patches/0636-Guardian-beam-workaround.patch b/Spigot-Server-Patches/0635-Guardian-beam-workaround.patch
similarity index 100%
rename from Spigot-Server-Patches/0636-Guardian-beam-workaround.patch
rename to Spigot-Server-Patches/0635-Guardian-beam-workaround.patch
diff --git a/Spigot-Server-Patches/0637-Added-WorldGameRuleChangeEvent.patch b/Spigot-Server-Patches/0636-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0637-Added-WorldGameRuleChangeEvent.patch
rename to Spigot-Server-Patches/0636-Added-WorldGameRuleChangeEvent.patch
diff --git a/Spigot-Server-Patches/0638-Added-ServerResourcesReloadedEvent.patch b/Spigot-Server-Patches/0637-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0638-Added-ServerResourcesReloadedEvent.patch
rename to Spigot-Server-Patches/0637-Added-ServerResourcesReloadedEvent.patch
diff --git a/Spigot-Server-Patches/0639-Added-world-settings-for-mobs-picking-up-loot.patch b/Spigot-Server-Patches/0638-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from Spigot-Server-Patches/0639-Added-world-settings-for-mobs-picking-up-loot.patch
rename to Spigot-Server-Patches/0638-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/Spigot-Server-Patches/0640-Implemented-BlockFailedDispenseEvent.patch b/Spigot-Server-Patches/0639-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0640-Implemented-BlockFailedDispenseEvent.patch
rename to Spigot-Server-Patches/0639-Implemented-BlockFailedDispenseEvent.patch
diff --git a/Spigot-Server-Patches/0641-Added-PlayerLecternPageChangeEvent.patch b/Spigot-Server-Patches/0640-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0641-Added-PlayerLecternPageChangeEvent.patch
rename to Spigot-Server-Patches/0640-Added-PlayerLecternPageChangeEvent.patch
diff --git a/Spigot-Server-Patches/0642-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0641-Fire-event-on-GS4-query.patch
similarity index 100%
rename from Spigot-Server-Patches/0642-Fire-event-on-GS4-query.patch
rename to Spigot-Server-Patches/0641-Fire-event-on-GS4-query.patch
diff --git a/Spigot-Server-Patches/0643-Added-PlayerLoomPatternSelectEvent.patch b/Spigot-Server-Patches/0642-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0643-Added-PlayerLoomPatternSelectEvent.patch
rename to Spigot-Server-Patches/0642-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/Spigot-Server-Patches/0644-Configurable-door-breaking-difficulty.patch b/Spigot-Server-Patches/0643-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from Spigot-Server-Patches/0644-Configurable-door-breaking-difficulty.patch
rename to Spigot-Server-Patches/0643-Configurable-door-breaking-difficulty.patch
diff --git a/Spigot-Server-Patches/0645-Empty-commands-shall-not-be-dispatched.patch b/Spigot-Server-Patches/0644-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from Spigot-Server-Patches/0645-Empty-commands-shall-not-be-dispatched.patch
rename to Spigot-Server-Patches/0644-Empty-commands-shall-not-be-dispatched.patch
diff --git a/Spigot-Server-Patches/0646-Implement-API-to-expose-exact-interaction-point.patch b/Spigot-Server-Patches/0645-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from Spigot-Server-Patches/0646-Implement-API-to-expose-exact-interaction-point.patch
rename to Spigot-Server-Patches/0645-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/Spigot-Server-Patches/0647-Remove-stale-POIs.patch b/Spigot-Server-Patches/0646-Remove-stale-POIs.patch
similarity index 100%
rename from Spigot-Server-Patches/0647-Remove-stale-POIs.patch
rename to Spigot-Server-Patches/0646-Remove-stale-POIs.patch
diff --git a/Spigot-Server-Patches/0648-Fix-villager-boat-exploit.patch b/Spigot-Server-Patches/0647-Fix-villager-boat-exploit.patch
similarity index 100%
rename from Spigot-Server-Patches/0648-Fix-villager-boat-exploit.patch
rename to Spigot-Server-Patches/0647-Fix-villager-boat-exploit.patch
diff --git a/Spigot-Server-Patches/0649-Entity-load-save-limit-per-chunk.patch b/Spigot-Server-Patches/0648-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from Spigot-Server-Patches/0649-Entity-load-save-limit-per-chunk.patch
rename to Spigot-Server-Patches/0648-Entity-load-save-limit-per-chunk.patch
diff --git a/Spigot-Server-Patches/0650-Add-sendOpLevel-API.patch b/Spigot-Server-Patches/0649-Add-sendOpLevel-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0650-Add-sendOpLevel-API.patch
rename to Spigot-Server-Patches/0649-Add-sendOpLevel-API.patch
diff --git a/Spigot-Server-Patches/0651-Add-StructureLocateEvent.patch b/Spigot-Server-Patches/0650-Add-StructureLocateEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0651-Add-StructureLocateEvent.patch
rename to Spigot-Server-Patches/0650-Add-StructureLocateEvent.patch
diff --git a/Spigot-Server-Patches/0652-Collision-option-for-requiring-a-player-participant.patch b/Spigot-Server-Patches/0651-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from Spigot-Server-Patches/0652-Collision-option-for-requiring-a-player-participant.patch
rename to Spigot-Server-Patches/0651-Collision-option-for-requiring-a-player-participant.patch
diff --git a/Spigot-Server-Patches/0653-Make-ProjectileHitEvent-Cancellable.patch b/Spigot-Server-Patches/0652-Make-ProjectileHitEvent-Cancellable.patch
similarity index 100%
rename from Spigot-Server-Patches/0653-Make-ProjectileHitEvent-Cancellable.patch
rename to Spigot-Server-Patches/0652-Make-ProjectileHitEvent-Cancellable.patch
diff --git a/Spigot-Server-Patches/0654-Return-chat-component-with-empty-text-instead-of-thr.patch b/Spigot-Server-Patches/0653-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from Spigot-Server-Patches/0654-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to Spigot-Server-Patches/0653-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/Spigot-Server-Patches/0655-Make-schedule-command-per-world.patch b/Spigot-Server-Patches/0654-Make-schedule-command-per-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0655-Make-schedule-command-per-world.patch
rename to Spigot-Server-Patches/0654-Make-schedule-command-per-world.patch
diff --git a/Spigot-Server-Patches/0656-Configurable-max-leash-distance.patch b/Spigot-Server-Patches/0655-Configurable-max-leash-distance.patch
similarity index 100%
rename from Spigot-Server-Patches/0656-Configurable-max-leash-distance.patch
rename to Spigot-Server-Patches/0655-Configurable-max-leash-distance.patch
diff --git a/Spigot-Server-Patches/0657-Implement-BlockPreDispenseEvent.patch b/Spigot-Server-Patches/0656-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0657-Implement-BlockPreDispenseEvent.patch
rename to Spigot-Server-Patches/0656-Implement-BlockPreDispenseEvent.patch
diff --git a/Spigot-Server-Patches/0658-Added-Vanilla-Entity-Tags.patch b/Spigot-Server-Patches/0657-Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from Spigot-Server-Patches/0658-Added-Vanilla-Entity-Tags.patch
rename to Spigot-Server-Patches/0657-Added-Vanilla-Entity-Tags.patch
diff --git a/Spigot-Server-Patches/0659-added-Wither-API.patch b/Spigot-Server-Patches/0658-added-Wither-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0659-added-Wither-API.patch
rename to Spigot-Server-Patches/0658-added-Wither-API.patch
diff --git a/Spigot-Server-Patches/0660-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/Spigot-Server-Patches/0659-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0660-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to Spigot-Server-Patches/0659-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/Spigot-Server-Patches/0661-Fix-console-spam-when-removing-chests-in-water.patch b/Spigot-Server-Patches/0660-Fix-console-spam-when-removing-chests-in-water.patch
similarity index 100%
rename from Spigot-Server-Patches/0661-Fix-console-spam-when-removing-chests-in-water.patch
rename to Spigot-Server-Patches/0660-Fix-console-spam-when-removing-chests-in-water.patch
diff --git a/Spigot-Server-Patches/0662-Add-toggle-for-always-placing-the-dragon-egg.patch b/Spigot-Server-Patches/0661-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from Spigot-Server-Patches/0662-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to Spigot-Server-Patches/0661-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/Spigot-Server-Patches/0663-Added-PlayerStonecutterRecipeSelectEvent.patch b/Spigot-Server-Patches/0662-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0663-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to Spigot-Server-Patches/0662-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/Spigot-Server-Patches/0664-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/Spigot-Server-Patches/0663-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0664-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to Spigot-Server-Patches/0663-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/Spigot-Server-Patches/0665-Skip-distance-map-update-when-spawning-disabled.patch b/Spigot-Server-Patches/0664-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 100%
rename from Spigot-Server-Patches/0665-Skip-distance-map-update-when-spawning-disabled.patch
rename to Spigot-Server-Patches/0664-Skip-distance-map-update-when-spawning-disabled.patch
diff --git a/Spigot-Server-Patches/0666-Reset-shield-blocking-on-dimension-change.patch b/Spigot-Server-Patches/0665-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from Spigot-Server-Patches/0666-Reset-shield-blocking-on-dimension-change.patch
rename to Spigot-Server-Patches/0665-Reset-shield-blocking-on-dimension-change.patch
diff --git a/Spigot-Server-Patches/0667-add-DragonEggFormEvent.patch b/Spigot-Server-Patches/0666-add-DragonEggFormEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0667-add-DragonEggFormEvent.patch
rename to Spigot-Server-Patches/0666-add-DragonEggFormEvent.patch
diff --git a/Spigot-Server-Patches/0668-EntityMoveEvent.patch b/Spigot-Server-Patches/0667-EntityMoveEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0668-EntityMoveEvent.patch
rename to Spigot-Server-Patches/0667-EntityMoveEvent.patch
diff --git a/Spigot-Server-Patches/0669-added-option-to-disable-pathfinding-updates-on-block.patch b/Spigot-Server-Patches/0668-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from Spigot-Server-Patches/0669-added-option-to-disable-pathfinding-updates-on-block.patch
rename to Spigot-Server-Patches/0668-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/Spigot-Server-Patches/0670-Inline-shift-direction-fields.patch b/Spigot-Server-Patches/0669-Inline-shift-direction-fields.patch
similarity index 100%
rename from Spigot-Server-Patches/0670-Inline-shift-direction-fields.patch
rename to Spigot-Server-Patches/0669-Inline-shift-direction-fields.patch
diff --git a/Spigot-Server-Patches/0671-Allow-adding-items-to-BlockDropItemEvent.patch b/Spigot-Server-Patches/0670-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0671-Allow-adding-items-to-BlockDropItemEvent.patch
rename to Spigot-Server-Patches/0670-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/Spigot-Server-Patches/0672-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/Spigot-Server-Patches/0671-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from Spigot-Server-Patches/0672-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to Spigot-Server-Patches/0671-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/Spigot-Server-Patches/0673-living-entity-allow-attribute-registration.patch b/Spigot-Server-Patches/0672-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from Spigot-Server-Patches/0673-living-entity-allow-attribute-registration.patch
rename to Spigot-Server-Patches/0672-living-entity-allow-attribute-registration.patch
diff --git a/Spigot-Server-Patches/0674-fix-dead-slime-setSize-invincibility.patch b/Spigot-Server-Patches/0673-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from Spigot-Server-Patches/0674-fix-dead-slime-setSize-invincibility.patch
rename to Spigot-Server-Patches/0673-fix-dead-slime-setSize-invincibility.patch
diff --git a/Spigot-Server-Patches/0675-Merchant-getRecipes-should-return-an-immutable-list.patch b/Spigot-Server-Patches/0674-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from Spigot-Server-Patches/0675-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to Spigot-Server-Patches/0674-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/Spigot-Server-Patches/0676-misc-debugging-dumps.patch b/Spigot-Server-Patches/0675-misc-debugging-dumps.patch
similarity index 100%
rename from Spigot-Server-Patches/0676-misc-debugging-dumps.patch
rename to Spigot-Server-Patches/0675-misc-debugging-dumps.patch
diff --git a/Spigot-Server-Patches/0677-Add-support-for-hex-color-codes-in-console.patch b/Spigot-Server-Patches/0676-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from Spigot-Server-Patches/0677-Add-support-for-hex-color-codes-in-console.patch
rename to Spigot-Server-Patches/0676-Add-support-for-hex-color-codes-in-console.patch
diff --git a/Spigot-Server-Patches/0678-Clear-SyncLoadInfo.patch b/Spigot-Server-Patches/0677-Clear-SyncLoadInfo.patch
similarity index 100%
rename from Spigot-Server-Patches/0678-Clear-SyncLoadInfo.patch
rename to Spigot-Server-Patches/0677-Clear-SyncLoadInfo.patch
diff --git a/Spigot-Server-Patches/0679-Expose-Tracked-Players.patch b/Spigot-Server-Patches/0678-Expose-Tracked-Players.patch
similarity index 100%
rename from Spigot-Server-Patches/0679-Expose-Tracked-Players.patch
rename to Spigot-Server-Patches/0678-Expose-Tracked-Players.patch
diff --git a/Spigot-Server-Patches/0680-Remove-streams-from-SensorNearest.patch b/Spigot-Server-Patches/0679-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from Spigot-Server-Patches/0680-Remove-streams-from-SensorNearest.patch
rename to Spigot-Server-Patches/0679-Remove-streams-from-SensorNearest.patch
diff --git a/Spigot-Server-Patches/0681-do-not-create-unnecessary-copies-of-passenger-list.patch b/Spigot-Server-Patches/0680-do-not-create-unnecessary-copies-of-passenger-list.patch
similarity index 100%
rename from Spigot-Server-Patches/0681-do-not-create-unnecessary-copies-of-passenger-list.patch
rename to Spigot-Server-Patches/0680-do-not-create-unnecessary-copies-of-passenger-list.patch
diff --git a/Spigot-Server-Patches/0682-MC-29274-Fix-Wither-hostility-towards-players.patch b/Spigot-Server-Patches/0681-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from Spigot-Server-Patches/0682-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to Spigot-Server-Patches/0681-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/Spigot-Server-Patches/0683-Throw-proper-exception-on-empty-JsonList-file.patch b/Spigot-Server-Patches/0682-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from Spigot-Server-Patches/0683-Throw-proper-exception-on-empty-JsonList-file.patch
rename to Spigot-Server-Patches/0682-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/Spigot-Server-Patches/0684-Improve-ServerGUI.patch b/Spigot-Server-Patches/0683-Improve-ServerGUI.patch
similarity index 100%
rename from Spigot-Server-Patches/0684-Improve-ServerGUI.patch
rename to Spigot-Server-Patches/0683-Improve-ServerGUI.patch
diff --git a/Spigot-Server-Patches/0685-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/Spigot-Server-Patches/0684-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from Spigot-Server-Patches/0685-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to Spigot-Server-Patches/0684-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/Spigot-Server-Patches/0686-fix-converting-txt-to-json-file.patch b/Spigot-Server-Patches/0685-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from Spigot-Server-Patches/0686-fix-converting-txt-to-json-file.patch
rename to Spigot-Server-Patches/0685-fix-converting-txt-to-json-file.patch
diff --git a/Spigot-Server-Patches/0687-Add-worldborder-events.patch b/Spigot-Server-Patches/0686-Add-worldborder-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0687-Add-worldborder-events.patch
rename to Spigot-Server-Patches/0686-Add-worldborder-events.patch
diff --git a/Spigot-Server-Patches/0688-added-PlayerNameEntityEvent.patch b/Spigot-Server-Patches/0687-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0688-added-PlayerNameEntityEvent.patch
rename to Spigot-Server-Patches/0687-added-PlayerNameEntityEvent.patch
diff --git a/Spigot-Server-Patches/0689-Prevent-grindstones-from-overstacking-items.patch b/Spigot-Server-Patches/0688-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from Spigot-Server-Patches/0689-Prevent-grindstones-from-overstacking-items.patch
rename to Spigot-Server-Patches/0688-Prevent-grindstones-from-overstacking-items.patch
diff --git a/Spigot-Server-Patches/0690-Add-recipe-to-cook-events.patch b/Spigot-Server-Patches/0689-Add-recipe-to-cook-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0690-Add-recipe-to-cook-events.patch
rename to Spigot-Server-Patches/0689-Add-recipe-to-cook-events.patch
diff --git a/Spigot-Server-Patches/0691-Add-Block-isValidTool.patch b/Spigot-Server-Patches/0690-Add-Block-isValidTool.patch
similarity index 100%
rename from Spigot-Server-Patches/0691-Add-Block-isValidTool.patch
rename to Spigot-Server-Patches/0690-Add-Block-isValidTool.patch
diff --git a/Spigot-Server-Patches/0692-Allow-using-signs-inside-spawn-protection.patch b/Spigot-Server-Patches/0691-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from Spigot-Server-Patches/0692-Allow-using-signs-inside-spawn-protection.patch
rename to Spigot-Server-Patches/0691-Allow-using-signs-inside-spawn-protection.patch
diff --git a/Spigot-Server-Patches/0693-Implement-Keyed-on-World.patch b/Spigot-Server-Patches/0692-Implement-Keyed-on-World.patch
similarity index 100%
rename from Spigot-Server-Patches/0693-Implement-Keyed-on-World.patch
rename to Spigot-Server-Patches/0692-Implement-Keyed-on-World.patch
diff --git a/Spigot-Server-Patches/0694-Add-fast-alternative-constructor-for-Vector3f.patch b/Spigot-Server-Patches/0693-Add-fast-alternative-constructor-for-Vector3f.patch
similarity index 100%
rename from Spigot-Server-Patches/0694-Add-fast-alternative-constructor-for-Vector3f.patch
rename to Spigot-Server-Patches/0693-Add-fast-alternative-constructor-for-Vector3f.patch
diff --git a/Spigot-Server-Patches/0695-Item-Rarity-API.patch b/Spigot-Server-Patches/0694-Item-Rarity-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0695-Item-Rarity-API.patch
rename to Spigot-Server-Patches/0694-Item-Rarity-API.patch