OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 04:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Finish kicking player before letting their clone in. Fixes BUKKIT-4960

Browse source
This commit is contained in:
Travis Watkins 2013-12-03 19:08:32 -06:00
parent bc0ac48074
commit 169fd46960
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/minecraft/server/PlayerConnection.java
View file

@ -167,6 +167,7 @@ public class PlayerConnection implements PacketPlayInListener {
ChatComponentText chatcomponenttext = new ChatComponentText(s); ChatComponentText chatcomponenttext = new ChatComponentText(s);
this.networkManager.handle(new PacketPlayOutKickDisconnect(chatcomponenttext), new GenericFutureListener[] { new PlayerConnectionFuture(this, chatcomponenttext)}); this.networkManager.handle(new PacketPlayOutKickDisconnect(chatcomponenttext), new GenericFutureListener[] { new PlayerConnectionFuture(this, chatcomponenttext)});
this.a(chatcomponenttext); // CraftBukkit - Process quit immediately
this.networkManager.g(); this.networkManager.g();
} }
@ -677,6 +678,7 @@ public class PlayerConnection implements PacketPlayInListener {
} }
public void a(IChatBaseComponent ichatbasecomponent) { 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 c.info(this.player.getName() + " lost connection: " + ichatbasecomponent.c()); // CraftBukkit - Don't toString the component
this.minecraftServer.au(); this.minecraftServer.au();
// CraftBukkit start - Replace vanilla quit message handling with our own. // CraftBukkit start - Replace vanilla quit message handling with our own.