PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Move AbstractReconnectManager to the API and rename to AbstractReconnectHandler.

Browse Source
This commit is contained in:
md_5
2013-09-16 08:21:53 +10:00
parent 38a8469ab4
commit 5ed5c71aea
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
import net.md_5.bungee.protocol.packet.PacketFEPing;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.reconnect.AbstractReconnectManager;
import net.md_5.bungee.api.AbstractReconnectHandler;
@RequiredArgsConstructor
public class InitialHandler extends PacketHandler implements PendingConnection
@@ -133,7 +133,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
private void respondToPing()
{
ServerInfo forced = AbstractReconnectManager.getForcedHost( this );
ServerInfo forced = AbstractReconnectHandler.getForcedHost( this );
final String motd = ( forced != null ) ? forced.getMotd() : listener.getMotd();
Callback<ServerPing> pingBack = new Callback<ServerPing>()
@@ -354,7 +354,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
server = bungee.getReconnectHandler().getServer( userCon );
} else
{
server = AbstractReconnectManager.getForcedHost( this );
server = AbstractReconnectHandler.getForcedHost( this );
}
userCon.connect( server, true );

48
proxy/src/main/java/net/md_5/bungee/reconnect/AbstractReconnectManager.java
View File

@@ -1,48 +0,0 @@
package net.md_5.bungee.reconnect;
import com.google.common.base.Preconditions;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.ReconnectHandler;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.PendingConnection;
import net.md_5.bungee.api.connection.ProxiedPlayer;
public abstract class AbstractReconnectManager implements ReconnectHandler
{
@Override
public ServerInfo getServer(ProxiedPlayer player)
{
ServerInfo server = getForcedHost( player.getPendingConnection() );
if ( server == null )
{
server = getStoredServer( player );
if ( server == null )
{
server = ProxyServer.getInstance().getServerInfo( player.getPendingConnection().getListener().getDefaultServer() );
}
Preconditions.checkState( server != null, "Default server not defined" );
}
return server;
}
public static ServerInfo getForcedHost(PendingConnection con)
{
if ( con.getVirtualHost() == null )
{
return null;
}
String forced = con.getListener().getForcedHosts().get( con.getVirtualHost().getHostString() );
if ( forced == null && con.getListener().isForceDefault() )
{
forced = con.getListener().getDefaultServer();
}
return ProxyServer.getInstance().getServerInfo( forced );
}
protected abstract ServerInfo getStoredServer(ProxiedPlayer player);
}

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

@@ -1,5 +1,6 @@
package net.md_5.bungee.reconnect;
import net.md_5.bungee.api.AbstractReconnectHandler;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
@@ -16,7 +17,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.error.YAMLException;
public class YamlReconnectHandler extends AbstractReconnectManager
public class YamlReconnectHandler extends AbstractReconnectHandler
{
private final Yaml yaml = new Yaml();