Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-12-25 10:07:38 +01:00
Code Issues Projects Releases Wiki Activity

Make forced hosts take higher priority than force default. Closes #184

Browse Source
This commit is contained in:
md_5 2013-03-14 21:18:59 +11:00
parent 4811e7be4f
commit 704fe11b05
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
proxy/src/main/java/net/md_5/bungee/YamlReconnectHandler.java
View File

@ -53,15 +53,14 @@ public class YamlReconnectHandler implements ReconnectHandler
{
ListenerInfo listener = player.getPendingConnection().getListener();
String name;
if ( listener.isForceDefault() )
String forced = listener.getForcedHosts().get( player.getPendingConnection().getVirtualHost().getHostName() );
if ( forced == null && listener.isForceDefault() )
{
name = listener.getDefaultServer();
} else
{
String forced = listener.getForcedHosts().get( player.getPendingConnection().getVirtualHost().getHostName() );
String server = ( forced == null ) ? data.get( key( player ) ) : forced;
name = ( server != null ) ? server : listener.getDefaultServer();
forced = listener.getDefaultServer();
}
String server = ( forced == null ) ? data.get( key( player ) ) : forced;
name = ( server != null ) ? server : listener.getDefaultServer();
ServerInfo info = ProxyServer.getInstance().getServerInfo( name );
if ( info == null )
{