From e4e01ccb5577ed9e72c62d14e87812cc1f30d686 Mon Sep 17 00:00:00 2001 From: vemacs Date: Sat, 26 Apr 2014 11:24:57 -0600 Subject: [PATCH] Null check --- .../net/md_5/bungee/connection/DownstreamBridge.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 a8ec6b25c..6ae424bca 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 @@ -345,9 +345,12 @@ public class DownstreamBridge extends PacketHandler if ( subChannel.equals( "ServerIP" ) ) { ServerInfo info = bungee.getServerInfo( in.readUTF() ); - out.writeUTF( "ServerIP" ); - out.writeUTF( info.getAddress().getAddress().getHostAddress() ); - out.writeShort( info.getAddress().getPort() ); + 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