diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2013-12-03 19:08:32 -0600 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2013-12-03 19:21:27 -0600 |
commit | 169fd469609647f0d359da5601fafe9f8dd83868 (patch) | |
tree | 200548ea8f8d842cb26ab33e94cc66170c994c39 /src/main/java/net/minecraft/server/PlayerConnection.java | |
parent | bc0ac480747d1976139db486d904b2f5e32091fe (diff) | |
download | craftbukkit-169fd469609647f0d359da5601fafe9f8dd83868.tar craftbukkit-169fd469609647f0d359da5601fafe9f8dd83868.tar.gz craftbukkit-169fd469609647f0d359da5601fafe9f8dd83868.tar.lz craftbukkit-169fd469609647f0d359da5601fafe9f8dd83868.tar.xz craftbukkit-169fd469609647f0d359da5601fafe9f8dd83868.zip |
Finish kicking player before letting their clone in. Fixes BUKKIT-4960
Diffstat (limited to 'src/main/java/net/minecraft/server/PlayerConnection.java')
-rw-r--r-- | src/main/java/net/minecraft/server/PlayerConnection.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java index 53e70c42..aa6d8d80 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -167,6 +167,7 @@ public class PlayerConnection implements PacketPlayInListener { ChatComponentText chatcomponenttext = new ChatComponentText(s); this.networkManager.handle(new PacketPlayOutKickDisconnect(chatcomponenttext), new GenericFutureListener[] { new PlayerConnectionFuture(this, chatcomponenttext)}); + this.a(chatcomponenttext); // CraftBukkit - Process quit immediately this.networkManager.g(); } @@ -677,6 +678,7 @@ public class PlayerConnection implements PacketPlayInListener { } public void a(IChatBaseComponent ichatbasecomponent) { + if (this.isDisconnected()) return; // CraftBukkit - Don't trigger twice on kicks 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. |