PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Nullcheck getServer on failed reconnect handler to account for failings on first connect

Browse Source
This commit is contained in:
md_5 2013-03-28 22:24:56 +11:00
parent caea1e3fa5
commit 8707995503
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,7 +143,7 @@ public final class UserConnection implements ProxiedPlayer
{ {
future.channel().close(); future.channel().close();
ServerInfo def = ProxyServer.getInstance().getServers().get( getPendingConnection().getListener().getDefaultServer() ); 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" ); sendMessage( ChatColor.RED + "Could not connect to target server, you have been moved to the default server" );
connect( def, false ); connect( def, false );