Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: e461dcfe #555: Item - add getters/setters for owner/thrower CraftBukkit Changes: 055870c4 #758: Item - add getters/setters for owner/thrower
This commit is contained in:
@@ -1,52 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 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/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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.entity.EntityType;
|
||||
import org.bukkit.entity.Item;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
+// Paper start
|
||||
+import javax.annotation.Nullable;
|
||||
+import java.util.UUID;
|
||||
+// Paper end
|
||||
+
|
||||
public class CraftItem extends CraftEntity implements Item {
|
||||
private final EntityItem item;
|
||||
|
||||
@@ -0,0 +0,0 @@ public class CraftItem extends CraftEntity implements Item {
|
||||
public void setCanMobPickup(boolean canMobPickup) {
|
||||
item.canMobPickup = canMobPickup;
|
||||
}
|
||||
+
|
||||
+ @Nullable
|
||||
+ @Override
|
||||
+ public UUID getOwner() {
|
||||
+ return item.getOwner();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void setOwner(@Nullable UUID owner) {
|
||||
+ item.setOwner(owner);
|
||||
+ }
|
||||
+
|
||||
+ @Nullable
|
||||
+ @Override
|
||||
+ public UUID getThrower() {
|
||||
+ return item.getThrower();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void setThrower(@Nullable UUID thrower) {
|
||||
+ item.setThrower(thrower);
|
||||
+ }
|
||||
// Paper End
|
||||
|
||||
@Override
|
||||
@@ -51,5 +51,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ // Paper End
|
||||
+
|
||||
@Override
|
||||
public String toString() {
|
||||
return "CraftItem";
|
||||
public void setOwner(UUID uuid) {
|
||||
item.setOwner(uuid);
|
||||
|
||||
Reference in New Issue
Block a user