From 93753cf16547eb0b8d4d091c7338758fbaaba0e3 Mon Sep 17 00:00:00 2001 From: BillyGalbreath 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 6752d0b8c..03fee65e4 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -411,20 +411,22 @@ public class EntityItem extends Entity { this.getDataWatcher().markDirty(EntityItem.b); // CraftBukkit - SPIGOT-4591, must mark dirty } - @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 6036592f7..4128ba4c0 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; @@ -53,6 +58,24 @@ public class CraftItem extends CraftEntity implements Item { public void setCanMobPickup(boolean canMobPickup) { item.canMobPickup = canMobPickup; } + + @Nullable + public UUID getOwner() { + return item.getOwner(); + } + + public void setOwner(@Nullable UUID owner) { + item.setOwner(owner); + } + + @Nullable + public UUID getThrower() { + return item.getThrower(); + } + + public void setThrower(@Nullable UUID thrower) { + item.setThrower(thrower); + } // Paper End @Override -- 2.20.1