Merge branch 'vemacs-master'

This commit is contained in:
Thinkofdeath 2014-05-01 11:00:12 +01:00
commit 33a098f4ba

View File

@ -342,6 +342,16 @@ public class DownstreamBridge extends PacketHandler
out.writeUTF( player.getUUID() );
}
}
if ( subChannel.equals( "ServerIP" ) )
{
ServerInfo info = bungee.getServerInfo( in.readUTF() );
if ( info != null )
{
out.writeUTF( "ServerIP" );
out.writeUTF( info.getAddress().getAddress().getHostAddress() );
out.writeShort( info.getAddress().getPort() );
}
}
// Check we haven't set out to null, and we have written data, if so reply back back along the BungeeCord channel
if ( out != null )