mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 02:55:47 +01:00
835bc39b03
Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes:d0bb0a1dFix some tests randomly failing997d378dFix client stall in specific teleportation scenariosb3dc2366SPIGOT-4307: Fix hacky API for banners on shields2a271162SPIGOT-4301: Fix more invalid enchants5d0d83bbSPIGOT-4309: Add "forced" display of particlesa6772578Add additional tests for CraftBlockDatace1af0c3Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From fd3d87725db3ea0854be12e875e0a8d3134d039b 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
|
|
|