diff options
| author | md_5 <git@md-5.net> | 2015-06-27 15:46:19 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-06-27 15:46:19 +1000 |
| commit | 76c834a8497c027419a0f7c9b271a6fc55fda18c (patch) | |
| tree | 86ddaf6e62314066f1b1ab3fb76c9ded020197bc /src/main/java/org/bukkit | |
| parent | c9c233b7965a4622808acaa4486ac5569d532cb6 (diff) | |
| download | craftbukkit-76c834a8497c027419a0f7c9b271a6fc55fda18c.tar craftbukkit-76c834a8497c027419a0f7c9b271a6fc55fda18c.tar.gz craftbukkit-76c834a8497c027419a0f7c9b271a6fc55fda18c.tar.lz craftbukkit-76c834a8497c027419a0f7c9b271a6fc55fda18c.tar.xz craftbukkit-76c834a8497c027419a0f7c9b271a6fc55fda18c.zip | |
Clean up World.getPlayers().
Original idea from CyberTiger, PR #150
Diffstat (limited to 'src/main/java/org/bukkit')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 8c9ead55..554e3b78 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -721,16 +721,13 @@ public class CraftWorld implements World { } public List<Player> getPlayers() { - List<Player> list = new ArrayList<Player>(); + List<Player> list = new ArrayList<Player>(world.players.size()); - for (Object o : world.entityList) { - if (o instanceof net.minecraft.server.Entity) { - net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o; - Entity bukkitEntity = mcEnt.getBukkitEntity(); + for (EntityHuman human : world.players) { + HumanEntity bukkitEntity = human.getBukkitEntity(); - if ((bukkitEntity != null) && (bukkitEntity instanceof Player)) { - list.add((Player) bukkitEntity); - } + if ((bukkitEntity != null) && (bukkitEntity instanceof Player)) { + list.add((Player) bukkitEntity); } } |