SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30 in SPIGOT/craftbukkit from ~ZREED/craftbukkit:master to master

Browse Source 
* commit '475a7cb5793692771e726cbd9d76ad9fc25bc3eb':
  Use PlayerList's UUID->EntityPlayer map in CraftServer.getPlayer(UUID)

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2014-12-05 18:22:38 +01:00
parent 75200edf67 475a7cb579
commit 42cddd043c
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@@ -415,13 +415,12 @@ public final class CraftServer implements Server {
return null; return null;
} }
// TODO: In 1.8+ this should use the server's UUID->EntityPlayer map
@Override @Override
public Player getPlayer(UUID id) { public Player getPlayer(UUID id) {
for (Player player : getOnlinePlayers()) { EntityPlayer player = playerList.a(id);
if (player.getUniqueId().equals(id)) {
return player; if (player != null) {
} return player.getBukkitEntity();
} }
return null; return null;