From 87079955036062e8fc3e8a169f34c059d7c8e2d4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 28 Mar 2013 22:24:56 +1100 Subject: [PATCH] Nullcheck getServer on failed reconnect handler to account for failings on first connect --- proxy/src/main/java/net/md_5/bungee/UserConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java index 531089e9..ba4fa908 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -143,7 +143,7 @@ public final class UserConnection implements ProxiedPlayer { future.channel().close(); ServerInfo def = ProxyServer.getInstance().getServers().get( getPendingConnection().getListener().getDefaultServer() ); - if ( retry & target != def && def != getServer().getInfo() ) + if ( retry & target != def && ( getServer() == null || def != getServer().getInfo() ) ) { sendMessage( ChatColor.RED + "Could not connect to target server, you have been moved to the default server" ); connect( def, false );