diff --git a/Spigot-Server-Patches/0752-Add-BellRevealRaiderEvent.patch b/Spigot-Server-Patches/0751-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0752-Add-BellRevealRaiderEvent.patch
rename to Spigot-Server-Patches/0751-Add-BellRevealRaiderEvent.patch
diff --git a/Spigot-Server-Patches/0751-Reset-villager-inventory-on-cancelled-pickup-event.patch b/Spigot-Server-Patches/0751-Reset-villager-inventory-on-cancelled-pickup-event.patch
deleted file mode 100644
index ab636ddb2..000000000
--- a/Spigot-Server-Patches/0751-Reset-villager-inventory-on-cancelled-pickup-event.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Fri, 28 May 2021 06:48:48 -0500
-Subject: [PATCH] Reset villager inventory on cancelled pickup event
-
-
-diff --git a/src/main/java/net/minecraft/world/InventorySubcontainer.java b/src/main/java/net/minecraft/world/InventorySubcontainer.java
-index 760e61167a053b9df73823600561ddb0cf3ff2c7..4a30630ca7596f95c9dd871e5bc1e2e1ea8abc08 100644
---- a/src/main/java/net/minecraft/world/InventorySubcontainer.java
-+++ b/src/main/java/net/minecraft/world/InventorySubcontainer.java
-@@ -34,6 +34,16 @@ public class InventorySubcontainer implements IInventory, AutoRecipeOutput {
-         return this.items;
-     }
- 
-+    // Paper start
-+    public void setContents(List<ItemStack> items) {
-+        this.items.clear();
-+        for(int i = 0; i < items.size(); i++) {
-+            this.items.set(i, items.get(i));
-+        }
-+        this.update();
-+    }
-+    // Paper end
-+
-     public void onOpen(CraftHumanEntity who) {
-         transaction.add(who);
-     }
-diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
-index 3f081177814dc874047e35e294ed18609f082d76..9278b8546a57f21051a65d59c2c01d39afaa68cc 100644
---- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
-@@ -845,8 +845,10 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
-             }
- 
-             // CraftBukkit start
-+            List<ItemStack> contentsSnapshot = new java.util.ArrayList<>(inventorysubcontainer.getContents()); // Paper
-             ItemStack itemstack1 = inventorysubcontainer.a(itemstack);
-             if (CraftEventFactory.callEntityPickupItemEvent(this, entityitem, itemstack1.getCount(), false).isCancelled()) {
-+                inventorysubcontainer.setContents(contentsSnapshot); // Paper
-                 return;
-             }
-             // CraftBukkit end
diff --git a/Spigot-Server-Patches/0753-Fix-invulnerable-end-crystals.patch b/Spigot-Server-Patches/0752-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from Spigot-Server-Patches/0753-Fix-invulnerable-end-crystals.patch
rename to Spigot-Server-Patches/0752-Fix-invulnerable-end-crystals.patch
diff --git a/Spigot-Server-Patches/0754-Add-ElderGuardianAppearanceEvent.patch b/Spigot-Server-Patches/0753-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0754-Add-ElderGuardianAppearanceEvent.patch
rename to Spigot-Server-Patches/0753-Add-ElderGuardianAppearanceEvent.patch
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 769a579cb..90a4d64a9 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 769a579cb0f61467b3ce0e0ae0e5a2bff352f524
+Subproject commit 90a4d64a9a73ab46cf7a87ddd86bf5795154dad9