diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2012-11-06 06:05:28 -0600 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2012-11-13 16:09:52 -0600 |
commit | 7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7 (patch) | |
tree | 843902ff94d82e86f40d7e0af1ac838fee859e75 /src/main/java/net/minecraft/server/PlayerManager.java | |
parent | a0c3b4f9d1b403fa64230f22b5dd3222181ba646 (diff) | |
download | craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar.gz craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar.lz craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar.xz craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.zip |
Update CraftBukkit to Minecraft 1.4.4.
Diffstat (limited to 'src/main/java/net/minecraft/server/PlayerManager.java')
-rw-r--r-- | src/main/java/net/minecraft/server/PlayerManager.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerManager.java b/src/main/java/net/minecraft/server/PlayerManager.java index 51e5ac51..2b4f8849 100644 --- a/src/main/java/net/minecraft/server/PlayerManager.java +++ b/src/main/java/net/minecraft/server/PlayerManager.java @@ -1,10 +1,12 @@ package net.minecraft.server; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; -import java.util.Queue; // CraftBukkit +// CraftBukkit start +import java.util.Queue; +import java.util.Iterator; +// CraftBukkit end public class PlayerManager { @@ -32,15 +34,15 @@ public class PlayerManager { } public void flush() { + // CraftBukkit start - use iterator Iterator iterator = this.d.iterator(); while (iterator.hasNext()) { PlayerInstance playerinstance = (PlayerInstance) iterator.next(); - playerinstance.a(); - - iterator.remove(); // CraftBukkit - remove to insure we are the consumer + iterator.remove(); } + // CraftBukkit end // this.d.clear(); // CraftBukkit - removals are already covered if (this.managedPlayers.isEmpty()) { |