summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorZach Brown <zach.brown@destroystokyo.com>2017-01-04 21:28:31 -0600
committermd_5 <git@md-5.net>2017-01-05 14:54:47 +1100
commit059434ce92119d7af85368137e5b693b7acea9d7 (patch)
tree10a5993ce59e5cf79bb488d231f195c21621fe4c /src/main/java
parent7e19325845e2cb8bcd94f46b4cc9de8ce1ad54cc (diff)
downloadcraftbukkit-059434ce92119d7af85368137e5b693b7acea9d7.tar
craftbukkit-059434ce92119d7af85368137e5b693b7acea9d7.tar.gz
craftbukkit-059434ce92119d7af85368137e5b693b7acea9d7.tar.lz
craftbukkit-059434ce92119d7af85368137e5b693b7acea9d7.tar.xz
craftbukkit-059434ce92119d7af85368137e5b693b7acea9d7.zip
SPIGOT-826: Add method to retrieve entity by UUID
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a838dfe2..39d4daec 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -76,6 +76,7 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers;
import org.bukkit.craftbukkit.util.DatFileFilter;
import org.bukkit.craftbukkit.util.Versioning;
import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions;
+import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
@@ -1662,6 +1663,13 @@ public final class CraftServer implements Server {
return new CraftBossBar(title, color, style, flags);
}
+ @Override
+ public Entity getEntity(UUID uuid) {
+ Validate.notNull(uuid, "UUID cannot be null");
+ net.minecraft.server.Entity entity = console.a(uuid); // PAIL: getEntity
+ return entity == null ? null : entity.getBukkitEntity();
+ }
+
@Deprecated
@Override
public UnsafeValues getUnsafe() {