Use server priority for downstream kicks too (#1978)

This commit is contained in:
Mystiflow
2016-11-06 00:25:46 +00:00
committed by md-5
parent 18f57f24fa
commit 908b7f7374
2 changed files with 6 additions and 10 deletions

View File

@@ -60,8 +60,8 @@ public class DownstreamBridge extends PacketHandler
return;
}
ServerInfo def = bungee.getServerInfo( con.getPendingConnection().getListener().getFallbackServer() );
if ( server.getInfo() != def )
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
if ( def != null )
{
server.setObsolete( true );
con.connectNow( def );
@@ -453,11 +453,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(Kick kick) throws Exception
{
ServerInfo def = bungee.getServerInfo( con.getPendingConnection().getListener().getFallbackServer() );
if ( Objects.equal( server.getInfo(), def ) )
{
def = null;
}
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
ServerKickEvent event = bungee.getPluginManager().callEvent( new ServerKickEvent( con, server.getInfo(), ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTED ) );
if ( event.isCancelled() && event.getCancelServer() != null )
{