Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-11-27 20:59:12 +01:00
Code Issues Projects Releases Wiki Activity

Mojang can't seem to decide what chat format to use for kicks, so lets just send a literal without our own prefix through. This (uncleanly) closes #714.

Browse Source
This commit is contained in:
md_5 2013-11-16 11:22:38 +11:00
parent e4602f027e
commit e39428ea0b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
View File

@ -3,8 +3,10 @@ package net.md_5.bungee.connection;
import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import java.io.DataInput; import java.io.DataInput;
import java.util.List;
import java.util.Objects; import java.util.Objects;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.EntityMap; import net.md_5.bungee.EntityMap;
import net.md_5.bungee.ServerConnection; import net.md_5.bungee.ServerConnection;
import net.md_5.bungee.UserConnection; import net.md_5.bungee.UserConnection;
@ -342,7 +344,7 @@ public class DownstreamBridge extends PacketHandler
con.connectNow( event.getCancelServer() ); con.connectNow( event.getCancelServer() );
} else } else
{ {
con.disconnect0( "[" + Util.stupify( bungee.getTranslation( "server_kick" ) ) + "," + event.getKickReason() + "]" ); // TODO: Json concat util method con.disconnect0( event.getKickReason() ); // TODO: Json concat util method // TODO: Prefix our own stuff.
} }
server.setObsolete( true ); server.setObsolete( true );
throw new CancelSendSignal(); throw new CancelSendSignal();