mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 00:56:39 +01:00
0976d52bbd
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 Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes:8d8475fcSPIGOT-4666: Force parameter in HumanEntity#sleep8b1588e2Fix ExplosionPrimeEvent#setFire not working with EnderCrystals39a287b7Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
From ec25fb2dc8987362a3aa99baf07baa8fd2a79ba9 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..be436f8df 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
|
|
+ */
|
|
+ @NotNull
|
|
+ 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.21.0
|
|
|