Use server priority for downstream kicks too (#1978)
This commit is contained in:
@@ -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 )
|
||||
{
|
||||
|
Reference in New Issue
Block a user