Paper/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
Aikar e4d10a6d67
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:
122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches
a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType()

CraftBukkit Changes:
bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException
3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches
95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType()
4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
2020-04-02 17:09:17 -04:00

46 lines
1.4 KiB
Diff

From 6ee338de00379380b81ef00c5af09fa30dd640ae 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 0c066bdfc..957a60167 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 Entity {
@@ -25,9 +26,22 @@ public interface Tameable extends Entity {
*/
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
--
2.25.1