From e98cfbd992abad36688b2f9b282154c93e3c8ede Mon Sep 17 00:00:00 2001 From: Travis Watkins Date: Tue, 24 Apr 2012 16:19:49 -0500 Subject: [PATCH] Remove address from throttle hashmap before killing socket. Fixes BUKKIT-659 --- src/main/java/net/minecraft/server/NetLoginHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/NetLoginHandler.java b/src/main/java/net/minecraft/server/NetLoginHandler.java index c91f60878d..aa0ac40026 100644 --- a/src/main/java/net/minecraft/server/NetLoginHandler.java +++ b/src/main/java/net/minecraft/server/NetLoginHandler.java @@ -157,9 +157,10 @@ public class NetLoginHandler extends NetHandler { String s = pingEvent.getMotd() + "\u00A7" + this.server.serverConfigurationManager.getPlayerCount() + "\u00A7" + pingEvent.getMaxPlayers(); // CraftBukkit end + this.server.networkListenThread.a(this.networkManager.getSocket()); // CraftBukkit - cleanup before killing connection this.networkManager.queue(new Packet255KickDisconnect(s)); this.networkManager.d(); - this.server.networkListenThread.a(this.networkManager.getSocket()); + // this.server.networkListenThread.a(this.networkManager.getSocket()); // CraftBukkit - moved up this.c = true; } catch (Exception exception) { exception.printStackTrace();