Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 21:19:00 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* commit '9e04f2f765194c087b52c3707a482ed9d5e56c8d':
  Use PlayerList's UUID->EntityPlayer map in CraftServer.getPlayer(UUID)
This commit is contained in:
Thinkofdeath 2014-12-05 18:22:38 +01:00
commit 91ee2c2365
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
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;