Paper/Spigot-Server-Patches/0395-Implement-getters-and-setters-for-EntityItem-owner-a.patch

From beb6f53cb74202be5ba6f91d544f59bf5552e514 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 6 Oct 2018 20:54:23 -0500
Subject: [PATCH] Implement getters and setters for EntityItem owner and
 thrower


diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index f596b4351b..67b29c55f6 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -410,20 +410,22 @@ public class EntityItem extends Entity {
         this.getDataWatcher().set(EntityItem.b, itemstack);
     }
 
-    @Nullable
-    public UUID k() {
+    @Nullable public UUID getOwner() { return k(); } // Paper - OBFHELPER
+    @Nullable public UUID k() { // Paper
         return this.g;
     }
 
+    public void setOwner(@Nullable UUID owner) { b(owner); } // Paper - OBFHELPER
     public void b(@Nullable UUID uuid) {
         this.g = uuid;
     }
 
-    @Nullable
-    public UUID l() {
+    @Nullable public UUID getThrower() { return l(); } // Paper - OBFHELPER
+    @Nullable public UUID l() { // Paper
         return this.f;
     }
 
+    public void setThrower(@Nullable UUID thrower) { c(thrower); } // Paper - OBFHELPER
     public void c(@Nullable UUID uuid) {
         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 1df17f09bb..3da71da5c2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
@@ -9,6 +9,11 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.CraftServer;
 
+// Paper start
+import javax.annotation.Nullable;
+import java.util.UUID;
+// Paper end
+
 public class CraftItem extends CraftEntity implements Item {
     private final EntityItem item;
 
@@ -21,6 +26,13 @@ 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());
     }
@@ -45,6 +57,24 @@ public class CraftItem extends CraftEntity implements Item {
     public void setCanMobPickup(boolean canMobPickup) {
         item.canMobPickup = canMobPickup;
     }
+
+    @Nullable
+    public UUID getOwner() {
+        return getHandle().getOwner();
+    }
+
+    public void setOwner(@Nullable UUID owner) {
+        getHandle().setOwner(owner);
+    }
+
+    @Nullable
+    public UUID getThrower() {
+        return getHandle().getThrower();
+    }
+
+    public void setThrower(@Nullable UUID thrower) {
+        getHandle().setThrower(thrower);
+    }
     // Paper End
 
     @Override
-- 
2.19.1