diff --git a/Spigot-Server-Patches/Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/Implement-alternative-item-despawn-rate.patch
index 277aecab73..3c6b9c8132 100644
--- a/Spigot-Server-Patches/Implement-alternative-item-despawn-rate.patch
+++ b/Spigot-Server-Patches/Implement-alternative-item-despawn-rate.patch
@@ -80,7 +80,7 @@ index 318a470ee..e7bbeef74 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 209169895..97e379090 100644
+index bc7e706d1..df26cef6a 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -0,0 +0,0 @@ import java.util.List;
diff --git a/Spigot-Server-Patches/InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/InventoryCloseEvent-Reason-API.patch
index f56fd2cec2..bb0001ff70 100644
--- a/Spigot-Server-Patches/InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/InventoryCloseEvent-Reason-API.patch
@@ -168,7 +168,7 @@ index e610c8aae..ce35e6bbc 100644
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e58dac2c8..9f39cfa45 100644
+index 87de825d5..f6e17986b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -0,0 +0,0 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch
index e98fce3242..4da6c98ff0 100644
--- a/Spigot-Server-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index c0b81223f1..1baff88c4a 100644
+index 27decbd06..17c291569 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -0,0 +0,0 @@ public class EntityItem extends Entity {
@@ -22,6 +22,7 @@ index c0b81223f1..1baff88c4a 100644
                  this.world.getServer().getPluginManager().callEvent(playerEvent);
 +                flyAtPlayer = playerEvent.getFlyAtPlayer(); // Paper
                  if (playerEvent.isCancelled()) {
+                     itemstack.setCount(i); // SPIGOT-5294 - restore count
 +                    // Paper Start
 +                    if (flyAtPlayer) {
 +                        entityhuman.receive(this, i);
diff --git a/work/Bukkit b/work/Bukkit
index ff0672ca66..e28fb3bd66 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit ff0672ca667beac3622f9efca9a0d701afcc94c7
+Subproject commit e28fb3bd669f1647dab40a5ca6820e003a298b75
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 96bc85f0b4..763e560135 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 96bc85f0b45e4f9150903a46e4a062ecc0501cc9
+Subproject commit 763e560135a991aaf2c3d33ad58216d09e98f23a