From e39428ea0be4256a587b24c37027ba8afbe7a21c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 16 Nov 2013 11:22:38 +1100 Subject: [PATCH] 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. --- .../java/net/md_5/bungee/connection/DownstreamBridge.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java index 41a6e16ac..51ff6bcc7 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java @@ -3,8 +3,10 @@ package net.md_5.bungee.connection; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import java.io.DataInput; +import java.util.List; import java.util.Objects; import lombok.RequiredArgsConstructor; +import net.md_5.bungee.BungeeCord; import net.md_5.bungee.EntityMap; import net.md_5.bungee.ServerConnection; import net.md_5.bungee.UserConnection; @@ -342,7 +344,7 @@ public class DownstreamBridge extends PacketHandler con.connectNow( event.getCancelServer() ); } 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 ); throw new CancelSendSignal();