c0d07c1b67
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: f009c3dd SPIGOT-5810, SPIGOT-5835: 'Better' handling of Player.isOnGround e677c370 Update ECJ version 5058a35d SPIGOT-5860: Item.setItemStack should be NotNull CraftBukkit Changes:d77f4d9bSPIGOT-5810, SPIGOT-5835: 'Better' handling of Player.isOnGround53c95627SPIGOT-5865: Piglin does not trigger EntityPickupItemEvent2ab04d24Update ECJ version7884e079SPIGOT-5868: Blocks do not tick in custom nether / end2a848286SPIGOT-5863: Don't check colour in scoreboard length validationf2cbce30SPIGOT-5866: Beehive unknown TargetReason Spigot Changes: ad703da0 SPIGOT-5870: /plugins "website" field shows "version" 1a27cfd8 #98: Improve output of /plugins command using text components 732d5bab Disable checkstyle in Spigot blocks 0199a9a6 #97: Add Memory Usage to Ticks Per Second Command. 33ea98fc SPIGOT-5858: NPE: Joining the server with an invalid dimension
60 Zeilen
1.7 KiB
Diff
60 Zeilen
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 6 Oct 2018 20:54:13 -0500
|
|
Subject: [PATCH] Implement getters and setters for EntityItem owner and
|
|
thrower
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
|
|
index ae3880491682067d4c5baef0a8c90b1036d67ac0..acd80d812fe88dee3978d19b24149e9fe0ac596b 100644
|
|
--- a/src/main/java/org/bukkit/entity/Item.java
|
|
+++ b/src/main/java/org/bukkit/entity/Item.java
|
|
@@ -3,6 +3,11 @@ package org.bukkit.entity;
|
|
import org.bukkit.inventory.ItemStack;
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
|
+// Paper start
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+import java.util.UUID;
|
|
+// Paper end
|
|
+
|
|
/**
|
|
* Represents a dropped item.
|
|
*/
|
|
@@ -51,5 +56,35 @@ public interface Item extends Entity {
|
|
* @param canMobPickup True to allow non-player entity pickup
|
|
*/
|
|
public void setCanMobPickup(boolean canMobPickup);
|
|
+
|
|
+ /**
|
|
+ * The owner of this item. Only the owner can pick up the item until it is within 10 seconds of despawning
|
|
+ *
|
|
+ * @return The owner's UUID
|
|
+ */
|
|
+ @Nullable
|
|
+ public UUID getOwner();
|
|
+
|
|
+ /**
|
|
+ * Set the owner of this item. Only the owner can pick up the item until it is within 10 seconds of despawning
|
|
+ *
|
|
+ * @param owner The owner's UUID
|
|
+ */
|
|
+ public void setOwner(@Nullable UUID owner);
|
|
+
|
|
+ /**
|
|
+ * Get the thrower of this item.
|
|
+ *
|
|
+ * @return The thrower's UUID
|
|
+ */
|
|
+ @Nullable
|
|
+ public UUID getThrower();
|
|
+
|
|
+ /**
|
|
+ * Set the thrower of this item.
|
|
+ *
|
|
+ * @param thrower The thrower's UUID
|
|
+ */
|
|
+ public void setThrower(@Nullable UUID thrower);
|
|
// Paper end
|
|
}
|