Move pending connects check

This commit is contained in:
md_5 2013-04-13 11:51:34 +10:00
parent dac259933b
commit ac1119bef8

View File

@ -131,7 +131,6 @@ public class ServerConnector extends PacketHandler
// Remove from old servers // Remove from old servers
user.getServer().setObsolete( true ); user.getServer().setObsolete( true );
user.getServer().disconnect( "Quitting" ); user.getServer().disconnect( "Quitting" );
user.pendingConnects.remove( target );
} }
// TODO: Fix this? // TODO: Fix this?
@ -146,6 +145,7 @@ public class ServerConnector extends PacketHandler
// Add to new server // Add to new server
// TODO: Move this to the connected() method of DownstreamBridge // TODO: Move this to the connected() method of DownstreamBridge
target.addPlayer( user ); target.addPlayer( user );
user.pendingConnects.remove( target );
user.setServer( server ); user.setServer( server );
ch.pipeline().get( HandlerBoss.class ).setHandler( new DownstreamBridge( bungee, user, server ) ); ch.pipeline().get( HandlerBoss.class ).setHandler( new DownstreamBridge( bungee, user, server ) );