ea855e2b46
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 Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes:d3ed1516Fix dangerously threaded beacons217a293dDon't relocate joptsimple to allow --help to work.1be05a21Prepare for imminent Java 12 releasea49270b2Mappings Update5259d80cSPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
62 Zeilen
1.7 KiB
Diff
62 Zeilen
1.7 KiB
Diff
From 3f5b8f92e4b73c627c658d72067ff46ae36f0015 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 cb9e9f369..a15f70ff4 100644
|
|
--- a/src/main/java/org/bukkit/entity/Item.java
|
|
+++ b/src/main/java/org/bukkit/entity/Item.java
|
|
@@ -4,6 +4,10 @@ import org.bukkit.inventory.ItemStack;
|
|
import org.jetbrains.annotations.NotNull;
|
|
import org.jetbrains.annotations.Nullable;
|
|
|
|
+// Paper start
|
|
+import java.util.UUID;
|
|
+// Paper end
|
|
+
|
|
/**
|
|
* Represents a dropped item.
|
|
*/
|
|
@@ -52,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
|
|
}
|
|
--
|
|
2.21.0
|
|
|