From ef7e3689b35045b4bfeb77071e6ad32bdde5e448 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Wed, 4 May 2011 22:06:08 -0400 Subject: Possibly fixed chunk loss bug encountered when teleporting. Thanks Raphfrk! --- src/main/java/net/minecraft/server/NetworkManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main') 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) { -- cgit v1.2.3