PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Only save to reconnectHandler if we have a listener that isn't forcing to the default server

Browse Source
This commit is contained in:
Ammar Askar 2013-08-13 11:24:38 +03:00 committed by md_5
parent f948acd634
commit 51e92de2dd
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
proxy/src/main/java/net/md_5/bungee/BungeeCord.java
View File

@ -240,9 +240,13 @@ public class BungeeCord extends ProxyServer
pluginsFolder.mkdir(); pluginsFolder.mkdir();
pluginManager.detectPlugins( pluginsFolder ); pluginManager.detectPlugins( pluginsFolder );
config.load(); config.load();
if ( reconnectHandler == null ) for ( ListenerInfo info : config.getListeners() )
{ {
reconnectHandler = new YamlReconnectHandler(); if ( !info.isForceDefault() && reconnectHandler == null )
{
reconnectHandler = new YamlReconnectHandler();
break;
}
} }
isRunning = true; isRunning = true;
@ -342,8 +346,11 @@ public class BungeeCord extends ProxyServer
} }
getLogger().info( "Saving reconnect locations" ); getLogger().info( "Saving reconnect locations" );
reconnectHandler.save(); if ( reconnectHandler != null )
reconnectHandler.close(); {
reconnectHandler.save();
reconnectHandler.close();
}
saveThread.cancel(); saveThread.cancel();
metricsThread.cancel(); metricsThread.cancel();

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

@ -32,7 +32,6 @@ import net.md_5.bungee.protocol.packet.PacketD1Team;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage; import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketFFKick; import net.md_5.bungee.protocol.packet.PacketFFKick;
;
@RequiredArgsConstructor @RequiredArgsConstructor
public class DownstreamBridge extends PacketHandler public class DownstreamBridge extends PacketHandler
@ -62,7 +61,10 @@ public class DownstreamBridge extends PacketHandler
{ {
// We lost connection to the server // We lost connection to the server
server.getInfo().removePlayer( con ); server.getInfo().removePlayer( con );
bungee.getReconnectHandler().setServer( con ); if (bungee.getReconnectHandler() != null)
{
bungee.getReconnectHandler().setServer( con );
}
if ( !server.isObsolete() ) if ( !server.isObsolete() )
{ {

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

@ -335,14 +335,21 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{ {
Preconditions.checkState( thisState == State.LOGIN, "Not expecting LOGIN" ); Preconditions.checkState( thisState == State.LOGIN, "Not expecting LOGIN" );
UserConnection userCon = new UserConnection( (BungeeCord) bungee, ch, getName(), this ); UserConnection userCon = new UserConnection( bungee, ch, getName(), this );
userCon.init(); userCon.init();
bungee.getPluginManager().callEvent( new PostLoginEvent( userCon ) ); bungee.getPluginManager().callEvent( new PostLoginEvent( userCon ) );
ch.getHandle().pipeline().get( HandlerBoss.class ).setHandler( new UpstreamBridge( bungee, userCon ) ); ch.getHandle().pipeline().get( HandlerBoss.class ).setHandler( new UpstreamBridge( bungee, userCon ) );
ServerInfo server = bungee.getReconnectHandler().getServer( userCon ); ServerInfo server;
if ( bungee.getReconnectHandler() != null )
{
server = bungee.getReconnectHandler().getServer( userCon );
} else
{
server = AbstractReconnectManager.getForcedHost( this );
}
userCon.connect( server, true ); userCon.connect( server, true );
thisState = State.FINISHED; thisState = State.FINISHED;