Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-10-23 04:50:05 +02:00
Code Issues Projects Releases Wiki Activity

Fix #1604 (#1605)

Browse Source
This commit is contained in:
BillyGalbreath 2018-10-21 14:39:21 -05:00 committed by Shane Freeder
parent 3fa9c0b5c3
commit 0db94d4fca
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 1d1165741a3b4814b84517f53a18d5e46bb1845a Mon Sep 17 00:00:00 2001
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 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
@ -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
@@ -410,20 +410,22 @@ 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
@@ -9,6 +9,11 @@ import org.bukkit.inventory.ItemStack;
@ -52,41 +52,27 @@ index 1df17f09..3da71da5 100644
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 {
@@ -45,6 +50,24 @@ public class CraftItem extends CraftEntity implements Item {
public void setCanMobPickup(boolean canMobPickup) {
item.canMobPickup = canMobPickup;
}
+
+ @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