PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Add functionality to replicate #336

Browse Source
This commit is contained in:
md_5 2013-09-15 07:29:22 +10:00
parent 702f434db1
commit d67acd7bc9
4 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/main/java/net/md_5/bungee/api/config/ListenerInfo.java
View File

@ -56,4 +56,9 @@ public class ListenerInfo
* Whether to set the local address when connecting to servers. * Whether to set the local address when connecting to servers.
*/ */
private final boolean setLocalAddress; private final boolean setLocalAddress;
/**
* Whether to pass the ping through when we can reliably get the target
* server (force default server).
*/
private final boolean pingPassthrough;
} }

3
proxy/src/main/java/net/md_5/bungee/config/Configuration.java
View File

@ -11,9 +11,6 @@ import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ConfigurationAdapter; import net.md_5.bungee.api.config.ConfigurationAdapter;
import net.md_5.bungee.api.config.ListenerInfo; import net.md_5.bungee.api.config.ListenerInfo;
import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.tab.GlobalPing;
import net.md_5.bungee.tab.Global;
import net.md_5.bungee.tab.ServerUnique;
import net.md_5.bungee.util.CaseInsensitiveMap; import net.md_5.bungee.util.CaseInsensitiveMap;
import net.md_5.bungee.util.CaseInsensitiveSet; import net.md_5.bungee.util.CaseInsensitiveSet;

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

@ -213,8 +213,9 @@ public class YamlConfig implements ConfigurationAdapter
value = DefaultTabList.GLOBAL_PING; value = DefaultTabList.GLOBAL_PING;
} }
boolean setLocalAddress = get( "bind_local_address", true, val ); boolean setLocalAddress = get( "bind_local_address", true, val );
boolean pingPassthrough = get( "ping_passthrough", false, val );
ListenerInfo info = new ListenerInfo( address, motd, maxPlayers, tabListSize, defaultServer, fallbackServer, forceDefault, forced, value.clazz, setLocalAddress ); ListenerInfo info = new ListenerInfo( address, motd, maxPlayers, tabListSize, defaultServer, fallbackServer, forceDefault, forced, value.clazz, setLocalAddress, pingPassthrough );
ret.add( info ); ret.add( info );
} }

40
proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
View File

@ -132,32 +132,38 @@ public class InitialHandler extends PacketHandler implements PendingConnection
} }
private void respondToPing() private void respondToPing()
{
try
{ {
ServerInfo forced = AbstractReconnectManager.getForcedHost( this ); ServerInfo forced = AbstractReconnectManager.getForcedHost( this );
String motd = listener.getMotd(); final String motd = ( forced != null ) ? forced.getMotd() : listener.getMotd();
if ( forced != null )
Callback<ServerPing> pingBack = new Callback<ServerPing>()
{ {
motd = forced.getMotd(); @Override
public void done(ServerPing result, Throwable error)
{
if ( error != null )
{
result = new ServerPing( (byte) -1, "-1", "Error pinging remote server: " + Util.exception( error ), -1, -1 );
} }
result = bungee.getPluginManager().callEvent( new ProxyPingEvent( InitialHandler.this, result ) ).getResponse();
ServerPing response = new ServerPing( bungee.getProtocolVersion(), bungee.getGameVersion(),
motd, bungee.getOnlineCount(), listener.getMaxPlayers() );
response = bungee.getPluginManager().callEvent( new ProxyPingEvent( InitialHandler.this, response ) ).getResponse();
String kickMessage = ChatColor.DARK_BLUE String kickMessage = ChatColor.DARK_BLUE
+ "\00" + response.getProtocolVersion() + "\00" + result.getProtocolVersion()
+ "\00" + response.getGameVersion() + "\00" + result.getGameVersion()
+ "\00" + response.getMotd() + "\00" + result.getMotd()
+ "\00" + response.getCurrentPlayers() + "\00" + result.getCurrentPlayers()
+ "\00" + response.getMaxPlayers(); + "\00" + result.getMaxPlayers();
BungeeCord.getInstance().getConnectionThrottle().unthrottle( getAddress().getAddress() ); BungeeCord.getInstance().getConnectionThrottle().unthrottle( getAddress().getAddress() );
disconnect( kickMessage ); disconnect( kickMessage );
} catch ( Throwable t ) }
};
if ( forced != null && listener.isPingPassthrough() )
{ {
t.printStackTrace(); forced.ping( pingBack );
} else
{
pingBack.done( new ServerPing( bungee.getProtocolVersion(), bungee.getGameVersion(), motd, bungee.getOnlineCount(), listener.getMaxPlayers() ), null );
} }
} }