diff --git a/Spigot-Server-Patches/0577-Add-additional-open-container-api-to-HumanEntity.patch b/Spigot-Server-Patches/0576-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0577-Add-additional-open-container-api-to-HumanEntity.patch
rename to Spigot-Server-Patches/0576-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/Spigot-Server-Patches/0576-Fix-block-data-exception-when-cancelling-PortalCreat.patch b/Spigot-Server-Patches/0576-Fix-block-data-exception-when-cancelling-PortalCreat.patch
deleted file mode 100644
index 2bee5c60fc..0000000000
--- a/Spigot-Server-Patches/0576-Fix-block-data-exception-when-cancelling-PortalCreat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Thu, 10 Sep 2020 09:00:02 +0100
-Subject: [PATCH] Fix block data exception when cancelling PortalCreateEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 04f14691ba9b0552b2c195c4a3b47f45cd72c5a2..11fa231caa5be12a43e646eb2c0300e597d25dd2 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1028,7 +1028,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-             Optional<BlockUtil.Rectangle> optional1 = worldserver.getTravelAgent().createPortal(blockposition, enumdirection_enumaxis, this, createRadius); // CraftBukkit
- 
-             if (!optional1.isPresent()) {
--                EntityPlayer.LOGGER.error("Unable to create a portal, likely target out of worldborder");
-+                //EntityPlayer.LOGGER.error("Unable to create a portal, likely target out of worldborder"); // Paper
-             }
- 
-             return optional1;
-diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 205f3f697e9c31674a4ac8db38467bb2e61cfe6b..9273fc22df2c9618efb09a8f95fd7e7f08652f88 100644
---- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
-+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-@@ -120,6 +120,7 @@ public class PortalTravelAgent {
-             EnumDirection enumdirection1 = enumdirection.g();
- 
-             if (!worldborder.a(blockposition1)) {
-+                MinecraftServer.LOGGER.error("Unable to create a portal, likely target out of worldborder"); // Paper - restore this message
-                 return Optional.empty();
-             }
- 
-@@ -160,7 +161,7 @@ public class PortalTravelAgent {
-         this.world.getServer().getPluginManager().callEvent(event);
-         if (!event.isCancelled()) {
-             blockList.updateList();
--        }
-+        } else return Optional.empty(); // Paper
-         // CraftBukkit end
-         return Optional.of(new BlockUtil.Rectangle(blockposition1.immutableCopy(), 2, 3));
-     }
diff --git a/Spigot-Server-Patches/0578-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/Spigot-Server-Patches/0577-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from Spigot-Server-Patches/0578-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to Spigot-Server-Patches/0577-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/Spigot-Server-Patches/0579-Extend-block-drop-capture-to-capture-all-items-added.patch b/Spigot-Server-Patches/0578-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from Spigot-Server-Patches/0579-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to Spigot-Server-Patches/0578-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/Spigot-Server-Patches/0580-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/Spigot-Server-Patches/0579-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from Spigot-Server-Patches/0580-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to Spigot-Server-Patches/0579-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/Spigot-Server-Patches/0581-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/Spigot-Server-Patches/0580-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from Spigot-Server-Patches/0581-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to Spigot-Server-Patches/0580-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/work/CraftBukkit b/work/CraftBukkit
index a339310c48..5da21f87d6 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit a339310c48548f0f82f923ff3f5fe2cdc7a8e8ba
+Subproject commit 5da21f87d6b0953f73941e68f5a09dc473d7cd5e