PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Add forced servers back.

Browse Source
This commit is contained in:
md_5
2013-01-21 14:04:46 +11:00
parent c281f008c3
commit 57576912c1
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,8 +50,8 @@ public class YamlReconnectHandler implements ReconnectHandler
{
return listener.getDefaultServer();
}
String server = data.get(key(player));
String forced = listener.getForcedHosts().get(player.getPendingConnection().getVirtualHost().getHostName());
String server = (forced == null) ? data.get(key(player)) : forced;
return (server != null) ? server : listener.getDefaultServer();
}

6
proxy/src/main/java/net/md_5/bungee/config/YamlConfig.java
View File

@@ -147,6 +147,9 @@ public class YamlConfig implements ConfigurationAdapter
{
new HashMap()
}));
Map<String, String> forcedDef = new HashMap<>();
forcedDef.put("pvp.md-5.net", "pvp");
Collection<ListenerInfo> ret = new HashSet<>();
for (Map<String, Object> val : base)
@@ -157,7 +160,8 @@ public class YamlConfig implements ConfigurationAdapter
boolean forceDefault = get("force_default_server", false, val);
String host = get("host", "0.0.0.0:25577", val);
InetSocketAddress address = Util.getAddr(host);
ListenerInfo info = new ListenerInfo(address, motd, maxPlayers, defaultServer, forceDefault);
Map<String, String> forced = get("forced_hosts", forcedDef, val);
ListenerInfo info = new ListenerInfo(address, motd, maxPlayers, defaultServer, forceDefault, forced);
ret.add(info);
}