diff --git a/Spigot-API-Patches/EntityPickupItemEvent.patch b/Spigot-API-Patches/EntityPickupItemEvent.patch
index f8e6211888..fa0866226e 100644
--- a/Spigot-API-Patches/EntityPickupItemEvent.patch
+++ b/Spigot-API-Patches/EntityPickupItemEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityPickupItemEvent
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java b/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java
 new file mode 100644
-index 00000000..f485f313
+index 00000000..3d40b515
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java
 @@ -0,0 +0,0 @@
diff --git a/Spigot-API-Patches/Item-canEntityPickup.patch b/Spigot-API-Patches/Item-canEntityPickup.patch
index 6f7b450dac..b61e4c2696 100644
--- a/Spigot-API-Patches/Item-canEntityPickup.patch
+++ b/Spigot-API-Patches/Item-canEntityPickup.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index 90260b7e..7163f8b0 100644
+index 90260b7e..2e98e4f9 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
 @@ -0,0 +0,0 @@ public interface Item extends Entity {
diff --git a/Spigot-API-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-API-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch
index ad9956d003..ae7b76ae30 100644
--- a/Spigot-API-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-API-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
-index dfba8163..fd97ea21 100644
+index dfba8163..83ee01f7 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.HandlerList;
diff --git a/Spigot-Server-Patches/EntityPickupItemEvent.patch b/Spigot-Server-Patches/EntityPickupItemEvent.patch
index 06d725ea5b..fb08537dcb 100644
--- a/Spigot-Server-Patches/EntityPickupItemEvent.patch
+++ b/Spigot-Server-Patches/EntityPickupItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] EntityPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 1d26555d..8cc55734 100644
+index a7bee79b8..a93c00014 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -0,0 +0,0 @@ import java.util.UUID;
diff --git a/Spigot-Server-Patches/Item-canEntityPickup.patch b/Spigot-Server-Patches/Item-canEntityPickup.patch
index 63cf704fa2..950c825352 100644
--- a/Spigot-Server-Patches/Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/Item-canEntityPickup.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 1d26555d..3179e627 100644
+index b594602ab..a7bee79b8 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -22,7 +22,7 @@ index 1d26555d..3179e627 100644
                      this.a(entityitem);
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 95ca1b8e..207b6f0b 100644
+index 1927e8e25..083155998 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 implements HopperPusher {
@@ -34,7 +34,7 @@ index 95ca1b8e..207b6f0b 100644
      private String g;
      private String h;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index a17a537d..6bacf204 100644
+index a17a537d6..1df17f09b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -0,0 +0,0 @@ public class CraftItem extends CraftEntity implements Item {
diff --git a/Spigot-Server-Patches/PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/PlayerAttemptPickupItemEvent.patch
index f4b090bd8b..9e625d7cc9 100644
--- a/Spigot-Server-Patches/PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/PlayerAttemptPickupItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 95ca1b8e..8820dd32 100644
+index 6ed3d7906..21a7a3a12 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.Iterator;
diff --git a/Spigot-Server-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch
index 9f3f76acc2..78708ca715 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 95ca1b8e..2dd27d1c 100644
+index 083155998..6ed3d7906 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 implements HopperPusher {
@@ -32,9 +32,9 @@ index 95ca1b8e..2dd27d1c 100644
                  }
  
 @@ -0,0 +0,0 @@ public class EntityItem extends Entity implements HopperPusher {
-                     }
-                 }
+             // CraftBukkit end
  
+             if (this.pickupDelay == 0 && (this.h == null || 6000 - this.age <= 200 || this.h.equals(entityhuman.getName())) && entityhuman.inventory.pickup(itemstack)) {
 -                entityhuman.receive(this, i);
 +                // Paper Start
 +                if (flyAtPlayer) {