summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWesley Wolfe <weswolf@aol.com>2012-06-17 01:25:01 -0500
committerWesley Wolfe <weswolf@aol.com>2012-06-17 01:25:01 -0500
commit6bbae461d5cf6fb508201633c1c9776808f1af7c (patch)
treed288bcf3ee0cce4c638cbdffc95f57332450cf69
parentae98a6f05174880ad9693ec44d9fa4ec9a07962e (diff)
downloadcraftbukkit-6bbae461d5cf6fb508201633c1c9776808f1af7c.tar
craftbukkit-6bbae461d5cf6fb508201633c1c9776808f1af7c.tar.gz
craftbukkit-6bbae461d5cf6fb508201633c1c9776808f1af7c.tar.lz
craftbukkit-6bbae461d5cf6fb508201633c1c9776808f1af7c.tar.xz
craftbukkit-6bbae461d5cf6fb508201633c1c9776808f1af7c.zip
Fix Heisenplayers
-rw-r--r--src/main/java/net/minecraft/server/NetworkManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index fd821c44..003fe74e 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -21,7 +21,7 @@ public class NetworkManager {
private DataInputStream input;
private DataOutputStream output;
private boolean l = true;
- private List m = Collections.synchronizedList(new ArrayList());
+ private java.util.Queue m = new java.util.concurrent.ConcurrentLinkedQueue(); // CraftBukkit - Concurrent linked queue
private List highPriorityQueue = Collections.synchronizedList(new ArrayList());
private List lowPriorityQueue = Collections.synchronizedList(new ArrayList());
private NetHandler packetListener;
@@ -224,7 +224,7 @@ public class NetworkManager {
int i = 1000;
while (!this.m.isEmpty() && i-- >= 0) {
- Packet packet = (Packet) this.m.remove(0);
+ Packet packet = (Packet) this.m.poll(); // CraftBukkit - remove -> poll
if (!this.q) packet.handle(this.packetListener); // CraftBukkit
}