From 3301c95066d3854768b43f6f89e66dc6995bf814 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 14 Mar 2014 19:27:46 +1100 Subject: [PATCH] Revert "Rejig forced hosts some more - closes #927" This reverts commit 72cadac76e1236a1e1b678642926de6562078277. --- .../java/net/md_5/bungee/api/AbstractReconnectHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/net/md_5/bungee/api/AbstractReconnectHandler.java b/api/src/main/java/net/md_5/bungee/api/AbstractReconnectHandler.java index 7bedc6a0..678f82bb 100644 --- a/api/src/main/java/net/md_5/bungee/api/AbstractReconnectHandler.java +++ b/api/src/main/java/net/md_5/bungee/api/AbstractReconnectHandler.java @@ -15,7 +15,7 @@ public abstract class AbstractReconnectHandler implements ReconnectHandler if ( server == null ) { server = getStoredServer( player ); - if ( server == null || player.getPendingConnection().getListener().isForceDefault() ) + if ( server == null ) { 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() ); - if ( forced == null ) + if ( forced == null || con.getListener().isForceDefault() ) { forced = con.getListener().getDefaultServer(); }