From 97cb46f9f8fcfed8ae47e89f80c598ba4423c8d7 Mon Sep 17 00:00:00 2001 From: feildmaster Date: Fri, 6 Dec 2013 13:17:04 -0600 Subject: Reintroduce disconnection flag that was removed in 1.7 update. --- src/main/java/net/minecraft/server/PlayerConnection.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java index 54c8881a..da1a7e70 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -77,6 +77,7 @@ public class PlayerConnection implements PacketPlayInListener { private double z; private double q; public boolean checkMovement = true; // CraftBukkit - private -> public + private boolean processedDisconnect; // CraftBukkit - added public PlayerConnection(MinecraftServer minecraftserver, NetworkManager networkmanager, EntityPlayer entityplayer) { this.minecraftServer = minecraftserver; @@ -678,7 +679,13 @@ public class PlayerConnection implements PacketPlayInListener { } public void a(IChatBaseComponent ichatbasecomponent) { - if (this.isDisconnected()) return; // CraftBukkit - Don't trigger twice on kicks + // CraftBukkit start - Rarely it would send a disconnect line twice + if (this.processedDisconnect) { + return; + } else { + this.processedDisconnect = true; + } + // CraftBukkit end c.info(this.player.getName() + " lost connection: " + ichatbasecomponent.c()); // CraftBukkit - Don't toString the component this.minecraftServer.au(); // CraftBukkit start - Replace vanilla quit message handling with our own. -- cgit v1.2.3