PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Revert "Rejig forced hosts some more - closes #927"

Browse Source 
This reverts commit 72cadac76e.
This commit is contained in:
md_5 2014-03-14 19:27:46 +11:00
parent 49f4dcb5b7
commit 3301c95066
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/main/java/net/md_5/bungee/api/AbstractReconnectHandler.java
View File

@ -15,7 +15,7 @@ public abstract class AbstractReconnectHandler implements ReconnectHandler
if ( server == null ) if ( server == null )
{ {
server = getStoredServer( player ); server = getStoredServer( player );
if ( server == null || player.getPendingConnection().getListener().isForceDefault() ) if ( server == null )
{ {
server = ProxyServer.getInstance().getServerInfo( player.getPendingConnection().getListener().getDefaultServer() ); server = ProxyServer.getInstance().getServerInfo( player.getPendingConnection().getListener().getDefaultServer() );
} }
@ -35,7 +35,7 @@ public abstract class AbstractReconnectHandler implements ReconnectHandler
String forced = con.getListener().getForcedHosts().get( con.getVirtualHost().getHostString() ); String forced = con.getListener().getForcedHosts().get( con.getVirtualHost().getHostString() );
if ( forced == null ) if ( forced == null || con.getListener().isForceDefault() )
{ {
forced = con.getListener().getDefaultServer(); forced = con.getListener().getDefaultServer();
} }