diff options
| author | Travis Watkins <amaranth@ubuntu.com> | 2012-04-24 16:19:49 -0500 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-04-24 21:58:24 -0400 |
| commit | e98cfbd992abad36688b2f9b282154c93e3c8ede (patch) | |
| tree | dca85b0489d53ff22da19416dc368b718d1a10dc /src/main/java/net/minecraft/server/NetLoginHandler.java | |
| parent | e3363db0a9c6e42cc8d08d44558e6d09106625d1 (diff) | |
| download | craftbukkit-e98cfbd992abad36688b2f9b282154c93e3c8ede.tar craftbukkit-e98cfbd992abad36688b2f9b282154c93e3c8ede.tar.gz craftbukkit-e98cfbd992abad36688b2f9b282154c93e3c8ede.tar.lz craftbukkit-e98cfbd992abad36688b2f9b282154c93e3c8ede.tar.xz craftbukkit-e98cfbd992abad36688b2f9b282154c93e3c8ede.zip | |
Remove address from throttle hashmap before killing socket. Fixes BUKKIT-659
Diffstat (limited to 'src/main/java/net/minecraft/server/NetLoginHandler.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/NetLoginHandler.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/NetLoginHandler.java b/src/main/java/net/minecraft/server/NetLoginHandler.java index c91f6087..aa0ac400 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(); |