diff options
| author | EvilSeph <evilseph@unaligned.org> | 2011-05-04 22:06:08 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@unaligned.org> | 2011-05-04 22:06:08 -0400 |
| commit | ef7e3689b35045b4bfeb77071e6ad32bdde5e448 (patch) | |
| tree | 70dbd04d37392e1d6c35336f8d0f7d2e650ca53b /src/main | |
| parent | 1f2c44e657953139b24bc3a1db46bf844b7c9109 (diff) | |
| download | craftbukkit-ef7e3689b35045b4bfeb77071e6ad32bdde5e448.tar craftbukkit-ef7e3689b35045b4bfeb77071e6ad32bdde5e448.tar.gz craftbukkit-ef7e3689b35045b4bfeb77071e6ad32bdde5e448.tar.lz craftbukkit-ef7e3689b35045b4bfeb77071e6ad32bdde5e448.tar.xz craftbukkit-ef7e3689b35045b4bfeb77071e6ad32bdde5e448.zip | |
Possibly fixed chunk loss bug encountered when teleporting. Thanks Raphfrk!
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/net/minecraft/server/NetworkManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java index 7a85b1d2..2dc97649 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -96,7 +96,8 @@ public class NetworkManager { Packet.a(packet, this.output); } - if ((flag || this.w-- <= 0) && !this.m.isEmpty() && (this.d == 0 || System.currentTimeMillis() - ((Packet) this.m.get(0)).timestamp >= (long) this.d)) { + // CraftBukkit - don't allow low priority packet to be sent unless it was placed in the queue before the first packet on the high priority queue + if ((flag || this.w-- <= 0) && !this.m.isEmpty() && (this.l.isEmpty() || ((Packet) this.l.get(0)).timestamp > ((Packet) this.m.get(0)).timestamp)) { flag = false; object = this.e; synchronized (this.e) { |