Remove switchMutex since its no longer required

This commit is contained in:
md_5 2014-02-27 07:32:23 +11:00
parent 37ed331515
commit 565af4d53e
2 changed files with 49 additions and 54 deletions

View File

@ -117,8 +117,6 @@ public class ServerConnector extends PacketHandler
ch.write( user.getSettings() ); ch.write( user.getSettings() );
} }
synchronized ( user.getSwitchMutex() )
{
if ( user.getServer() == null ) if ( user.getServer() == null )
{ {
// Once again, first connection // Once again, first connection
@ -176,7 +174,6 @@ public class ServerConnector extends PacketHandler
user.setServer( server ); user.setServer( server );
ch.getHandle().pipeline().get( HandlerBoss.class ).setHandler( new DownstreamBridge( bungee, user, server ) ); ch.getHandle().pipeline().get( HandlerBoss.class ).setHandler( new DownstreamBridge( bungee, user, server ) );
}
bungee.getPluginManager().callEvent( new ServerSwitchEvent( user ) ); bungee.getPluginManager().callEvent( new ServerSwitchEvent( user ) );

View File

@ -67,8 +67,6 @@ public final class UserConnection implements ProxiedPlayer
@Setter @Setter
private boolean dimensionChange = true; private boolean dimensionChange = true;
@Getter @Getter
private final Object switchMutex = new Object();
@Getter
private final Collection<ServerInfo> pendingConnects = new HashSet<>(); private final Collection<ServerInfo> pendingConnects = new HashSet<>();
/*========================================================================*/ /*========================================================================*/
@Getter @Getter