diff --git a/Spigot-Server-Patches/Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 0d3fef2d3d..11841a239d 100644
--- a/Spigot-Server-Patches/Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index f596b435..67b29c55 100644
+index 7ac07ac07ac0..7ac07ac07ac0 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 {
@@ -37,7 +37,7 @@ index f596b435..67b29c55 100644
          this.f = uuid;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 1df17f09..3da71da5 100644
+index 7ac07ac07ac0..7ac07ac07ac0 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 @@ import org.bukkit.inventory.ItemStack;
@@ -52,20 +52,6 @@ index 1df17f09..3da71da5 100644
  public class CraftItem extends CraftEntity implements Item {
      private final EntityItem item;
  
-@@ -0,0 +0,0 @@ public class CraftItem extends CraftEntity implements Item {
-         this(server, entity, entity);
-     }
- 
-+    // Paper start
-+    @Override
-+    public EntityItem getHandle() {
-+        return (EntityItem) entity;
-+    }
-+    // Paper end
-+
-     public ItemStack getItemStack() {
-         return CraftItemStack.asCraftMirror(item.getItemStack());
-     }
 @@ -0,0 +0,0 @@ public class CraftItem extends CraftEntity implements Item {
      public void setCanMobPickup(boolean canMobPickup) {
          item.canMobPickup = canMobPickup;
@@ -73,20 +59,20 @@ index 1df17f09..3da71da5 100644
 +
 +    @Nullable
 +    public UUID getOwner() {
-+        return getHandle().getOwner();
++        return item.getOwner();
 +    }
 +
 +    public void setOwner(@Nullable UUID owner) {
-+        getHandle().setOwner(owner);
++        item.setOwner(owner);
 +    }
 +
 +    @Nullable
 +    public UUID getThrower() {
-+        return getHandle().getThrower();
++        return item.getThrower();
 +    }
 +
 +    public void setThrower(@Nullable UUID thrower) {
-+        getHandle().setThrower(thrower);
++        item.setThrower(thrower);
 +    }
      // Paper End