Proper case sensitivity + dont reverse lookup forced hosts

This commit is contained in:
md_5 2013-06-02 09:23:05 +10:00
parent dce0f6b408
commit 0b0d09427d
2 changed files with 2 additions and 2 deletions

View File

@ -190,7 +190,7 @@ public class YamlConfig implements ConfigurationAdapter
String host = get( "host", "0.0.0.0:25577", val ); String host = get( "host", "0.0.0.0:25577", val );
int tabListSize = get( "tab_size", 60, val ); int tabListSize = get( "tab_size", 60, val );
InetSocketAddress address = Util.getAddr( host ); InetSocketAddress address = Util.getAddr( host );
Map<String, String> forced = get( "forced_hosts", forcedDef, val ); Map<String, String> forced = new CaseInsensitiveMap<>( get( "forced_hosts", forcedDef, val ) );
String textureURL = get( "texture_url", null, val ); String textureURL = get( "texture_url", null, val );
int textureSize = get( "texture_size", 16, val ); int textureSize = get( "texture_size", 16, val );
TexturePackInfo texture = ( textureURL == null ) ? null : new TexturePackInfo( textureURL, textureSize ); TexturePackInfo texture = ( textureURL == null ) ? null : new TexturePackInfo( textureURL, textureSize );

View File

@ -15,7 +15,7 @@ public abstract class AbstractReconnectManager implements ReconnectHandler
{ {
ListenerInfo listener = player.getPendingConnection().getListener(); ListenerInfo listener = player.getPendingConnection().getListener();
String name; String name;
String forced = listener.getForcedHosts().get( player.getPendingConnection().getVirtualHost().getHostName().toLowerCase() ); String forced = listener.getForcedHosts().get( player.getPendingConnection().getVirtualHost().getHostString() );
if ( forced == null && listener.isForceDefault() ) if ( forced == null && listener.isForceDefault() )
{ {
forced = listener.getDefaultServer(); forced = listener.getDefaultServer();