twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-03 05:32:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Simplify getEntity by UUID patch, misc readme changes

Browse Source
This commit is contained in:
Zach Brown
2016-06-09 21:43:32 -05:00
parent a639c9b080
commit 59cc0a9834
3 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Spigot-Server-Patches/Add-getEntity-by-UUID-API.patch
View File

@@ -9,26 +9,22 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
return (Bukkit.getServer() instanceof CraftServer) ? ((CraftServer) Bukkit.getServer()).getServer() : null;
this.Y = 0L;
}
// CraftBukkit end
+
+ // Paper start
+ public Entity getEntity(UUID uuid) {
+ Entity entity;
+ for (WorldServer world : worldServer) {
+ if (world == null) {
+ continue;
+ }
+ entity = world.getEntity(uuid);
+ if (entity != null && !entity.dead) {
+ return entity;
+ }
+ }
+ return null;
+ }
+ // Paper end
}
+ public Entity getEntity(UUID uuid) { return this.a(uuid); } // Paper - OBFHELPER
@Nullable
public Entity a(UUID uuid) {
WorldServer[] aworldserver = this.worldServer;
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
if (worldserver != null) {
Entity entity = worldserver.getEntity(uuid);
- if (entity != null) {
+ if (entity != null && entity.isAlive()) {
return entity;
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java