mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 22:13:42 +01:00
05466e3b47
Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes:a9c796f1SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations195f071eSPIGOT-4219: Event for PigZombies angering.5e3082c7SPIGOT-4230: Improve legacy block types
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From 7e815733a7a41f10d0b3c836a3a30980d515fba8 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 24 Feb 2018 01:14:55 -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/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
|
index e56bef3340..cc9d432e7f 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
|
@@ -83,6 +83,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
|
|
}
|
|
}
|
|
|
|
+ public UUID getOwnerUniqueId() {
|
|
+ return getOwnerUUID();
|
|
+ }
|
|
public UUID getOwnerUUID() {
|
|
return getHandle().getOwnerUUID();
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
|
|
index eaaebeab83..2e959321b5 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
|
|
@@ -18,6 +18,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
|
|
return (EntityTameableAnimal)super.getHandle();
|
|
}
|
|
|
|
+ public UUID getOwnerUniqueId() {
|
|
+ return getOwnerUUID();
|
|
+ }
|
|
public UUID getOwnerUUID() {
|
|
try {
|
|
return getHandle().getOwnerUUID();
|
|
--
|
|
2.18.0
|
|
|