core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-API-Patches/0085-Tameable-getOwnerUniqu...

46 lines
1.4 KiB
Diff
Raw Normal View History

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 21:07:06 +00:00
From 6ee338de00379380b81ef00c5af09fa30dd640ae Mon Sep 17 00:00:00 2001
Tameable#getOwnerUUID API This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. This method is already implemented on the server, just needed to expose it.
2018-02-24 05:57:03 +00:00
From: Aikar <aikar@aikar.co>
Date: Sat, 24 Feb 2018 00:55:52 -0500
Rename getOwnerUUID to Tameable#getOwnerUniqueId for consistency for the @kashike, thanks for adding a server diff to use this name!
2018-02-24 06:16:01 +00:00
Subject: [PATCH] Tameable#getOwnerUniqueId API
Tameable#getOwnerUUID API This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. This method is already implemented on the server, just needed to expose it.
2018-02-24 05:57:03 +00:00
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
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 21:07:06 +00:00
index 0c066bdfc..957a60167 100644
Tameable#getOwnerUUID API This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. This method is already implemented on the server, just needed to expose it.
2018-02-24 05:57:03 +00:00
--- a/src/main/java/org/bukkit/entity/Tameable.java
+++ b/src/main/java/org/bukkit/entity/Tameable.java
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep 8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals 39a287b7 Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
2019-03-20 00:28:15 +00:00
@@ -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 {
Tameable#getOwnerUUID API This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. This method is already implemented on the server, just needed to expose it.
2018-02-24 05:57:03 +00:00
*/
public void setTamed(boolean tame);
+ // Paper start
+ /**
+ * Gets the owners UUID
+ *
+ * @return the owners UUID, or null if not owned
+ */
Fix nullability annotation for Tameable#getOwnerUniqueId (Fixes #2968)
2020-02-22 15:30:42 +00:00
+ @Nullable
Rename getOwnerUUID to Tameable#getOwnerUniqueId for consistency for the @kashike, thanks for adding a server diff to use this name!
2018-02-24 06:16:01 +00:00
+ public java.util.UUID getOwnerUniqueId();
Tameable#getOwnerUUID API This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. This method is already implemented on the server, just needed to expose it.
2018-02-24 05:57:03 +00:00
+ // Paper end
+
/**
* Gets the current owning AnimalTamer
*
Rename getOwnerUUID to Tameable#getOwnerUniqueId for consistency for the @kashike, thanks for adding a server diff to use this name!
2018-02-24 06:16:01 +00:00
+ * @see #getOwnerUniqueId() Recommended to use UUID version instead of this for performance.
Tameable#getOwnerUUID API This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. This method is already implemented on the server, just needed to expose it.
2018-02-24 05:57:03 +00:00
+ * 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
*/
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep 8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals 39a287b7 Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
2019-03-20 00:28:15 +00:00
@Nullable
Tameable#getOwnerUUID API This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. This method is already implemented on the server, just needed to expose it.
2018-02-24 05:57:03 +00:00
--
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 21:07:06 +00:00
2.25.1
Tameable#getOwnerUUID API This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. This method is already implemented on the server, just needed to expose it.
2018-02-24 05:57:03 +00:00