mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-06 03:34:48 +02:00
36f34f01c0
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: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 24 Feb 2018 00:55:52 -0500
|
|
Subject: [PATCH] Tameable#getOwnerUniqueId API
|
|
|
|
This is faster if all you need is the UUID, as .getOwner() will cause
|
|
an OfflinePlayer to be loaded from disk.
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java
|
|
index 26c996cd41acc88490ac0135a9239cffc03e8efb..65e68da98ab66ed781bce2f0dbe0913be48d2990 100644
|
|
--- a/src/main/java/org/bukkit/entity/Tameable.java
|
|
+++ b/src/main/java/org/bukkit/entity/Tameable.java
|
|
@@ -1,5 +1,6 @@
|
|
package org.bukkit.entity;
|
|
|
|
+import org.jetbrains.annotations.NotNull;
|
|
import org.jetbrains.annotations.Nullable;
|
|
|
|
public interface Tameable extends Animals {
|
|
@@ -25,9 +26,22 @@ public interface Tameable extends Animals {
|
|
*/
|
|
public void setTamed(boolean tame);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the owners UUID
|
|
+ *
|
|
+ * @return the owners UUID, or null if not owned
|
|
+ */
|
|
+ @Nullable
|
|
+ public java.util.UUID getOwnerUniqueId();
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the current owning AnimalTamer
|
|
*
|
|
+ * @see #getOwnerUniqueId() Recommended to use UUID version instead of this for performance.
|
|
+ * This method will cause OfflinePlayer to be loaded from disk if the owner is not online.
|
|
+ *
|
|
* @return the owning AnimalTamer, or null if not owned
|
|
*/
|
|
@Nullable
|