PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Proper replacement for #701, closes #691

Browse Source
This commit is contained in:
md_5 2013-11-05 18:16:33 +11:00
parent 14371a1a8c
commit 8e390b5714
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
proxy/src/main/java/net/md_5/bungee/UserConnection.java
View File

@ -255,11 +255,16 @@ public final class UserConnection implements ProxiedPlayer
@Override @Override
public synchronized void disconnect(String reason) public synchronized void disconnect(String reason)
{
disconnect0( Util.stupify( reason ) );
}
public synchronized void disconnect0(String reason)
{ {
if ( ch.getHandle().isActive() ) if ( ch.getHandle().isActive() )
{ {
bungee.getLogger().log( Level.INFO, "[" + getName() + "] disconnected with: " + reason ); bungee.getLogger().log( Level.INFO, "[" + getName() + "] disconnected with: " + reason );
unsafe().sendPacket( new Kick( Util.stupify( reason ) ) ); unsafe().sendPacket( new Kick(reason) );
ch.close(); ch.close();
if ( server != null ) if ( server != null )
{ {

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

@ -342,7 +342,7 @@ public class DownstreamBridge extends PacketHandler
con.connectNow( event.getCancelServer() ); con.connectNow( event.getCancelServer() );
} else } else
{ {
con.disconnect( bungee.getTranslation( "server_kick" ) + event.getKickReason() ); con.disconnect0( "[" + Util.stupify( bungee.getTranslation( "server_kick" ) ) + "," + event.getKickReason() + "]" ); // TODO: Json concat util method
} }
server.setObsolete( true ); server.setObsolete( true );
throw new CancelSendSignal(); throw new CancelSendSignal();