Readd missed diff

This commit is contained in:
Thinkofdeath 2015-05-20 16:15:22 +01:00
parent db5fd9c79e
commit 5e914463bf

View File

@ -1,5 +1,5 @@
--- /home/matt/mc-dev-private//net/minecraft/server/PlayerConnection.java 2015-05-05 21:53:39.701102844 +0100 --- /home/matt/mc-dev-private//net/minecraft/server/PlayerConnection.java 2015-05-20 16:15:15.756362905 +0100
+++ src/main/java/net/minecraft/server/PlayerConnection.java 2015-05-05 21:53:39.701102844 +0100 +++ src/main/java/net/minecraft/server/PlayerConnection.java 2015-05-20 16:15:15.760362840 +0100
@@ -17,6 +17,48 @@ @@ -17,6 +17,48 @@
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -538,6 +538,7 @@
public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {} public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {}
public void a(IChatBaseComponent ichatbasecomponent) { public void a(IChatBaseComponent ichatbasecomponent) {
- PlayerConnection.c.info(this.player.getName() + " lost connection: " + ichatbasecomponent);
+ // CraftBukkit start - Rarely it would send a disconnect line twice + // CraftBukkit start - Rarely it would send a disconnect line twice
+ if (this.processedDisconnect) { + if (this.processedDisconnect) {
+ return; + return;
@ -545,7 +546,7 @@
+ this.processedDisconnect = true; + this.processedDisconnect = true;
+ } + }
+ // CraftBukkit end + // CraftBukkit end
PlayerConnection.c.info(this.player.getName() + " lost connection: " + ichatbasecomponent); + PlayerConnection.c.info(this.player.getName() + " lost connection: " + ichatbasecomponent.c()); // CraftBukkit - Don't toString the component
+ // CraftBukkit start - Replace vanilla quit message handling with our own. + // CraftBukkit start - Replace vanilla quit message handling with our own.
+ /* + /*
this.minecraftServer.aH(); this.minecraftServer.aH();