Use server priority for downstream kicks too (#1978)
This commit is contained in:
parent
18f57f24fa
commit
908b7f7374
@ -60,8 +60,8 @@ public class DownstreamBridge extends PacketHandler
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ServerInfo def = bungee.getServerInfo( con.getPendingConnection().getListener().getFallbackServer() );
|
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
|
||||||
if ( server.getInfo() != def )
|
if ( def != null )
|
||||||
{
|
{
|
||||||
server.setObsolete( true );
|
server.setObsolete( true );
|
||||||
con.connectNow( def );
|
con.connectNow( def );
|
||||||
@ -453,11 +453,7 @@ public class DownstreamBridge extends PacketHandler
|
|||||||
@Override
|
@Override
|
||||||
public void handle(Kick kick) throws Exception
|
public void handle(Kick kick) throws Exception
|
||||||
{
|
{
|
||||||
ServerInfo def = bungee.getServerInfo( con.getPendingConnection().getListener().getFallbackServer() );
|
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
|
||||||
if ( Objects.equal( server.getInfo(), def ) )
|
|
||||||
{
|
|
||||||
def = null;
|
|
||||||
}
|
|
||||||
ServerKickEvent event = bungee.getPluginManager().callEvent( new ServerKickEvent( con, server.getInfo(), ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTED ) );
|
ServerKickEvent event = bungee.getPluginManager().callEvent( new ServerKickEvent( con, server.getInfo(), ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTED ) );
|
||||||
if ( event.isCancelled() && event.getCancelServer() != null )
|
if ( event.isCancelled() && event.getCancelServer() != null )
|
||||||
{
|
{
|
||||||
|
@ -6,8 +6,8 @@ command_list=\u00a7a[{0}] \u00a7e({1}): \u00a7r{2}
|
|||||||
connect_kick=\u00a7cKicked whilst connecting to {0}: {1}
|
connect_kick=\u00a7cKicked whilst connecting to {0}: {1}
|
||||||
connect_kick_outdated_forge=\u00a7cYour version of Forge is outdated. Please update Forge and try again.
|
connect_kick_outdated_forge=\u00a7cYour version of Forge is outdated. Please update Forge and try again.
|
||||||
current_server=\u00a76You are currently connected to {0}.
|
current_server=\u00a76You are currently connected to {0}.
|
||||||
fallback_kick=\u00a7cCould not connect to default or fallback server, please try again later: {0}
|
fallback_kick=\u00a7cCould not connect to a default or fallback server, please try again later: {0}
|
||||||
fallback_lobby=\u00a7cCould not connect to target server, you have been moved to the fallback server.
|
fallback_lobby=\u00a7cCould not connect to target server, you have been moved to a fallback server.
|
||||||
lost_connection=[Proxy] Lost connection to server.
|
lost_connection=[Proxy] Lost connection to server.
|
||||||
mojang_fail=Error occurred while contacting login servers, are they down?
|
mojang_fail=Error occurred while contacting login servers, are they down?
|
||||||
no_permission=\u00a7cYou do not have permission to execute this command!
|
no_permission=\u00a7cYou do not have permission to execute this command!
|
||||||
@ -19,7 +19,7 @@ proxy_full=Server is full!
|
|||||||
restart=[Proxy] Proxy restarting.
|
restart=[Proxy] Proxy restarting.
|
||||||
server_kick=[Kicked]
|
server_kick=[Kicked]
|
||||||
server_list=\u00a76You may connect to the following servers at this time:
|
server_list=\u00a76You may connect to the following servers at this time:
|
||||||
server_went_down=\u00a7cThe server you were previously on went down, you have been connected to the lobby
|
server_went_down=\u00a7cThe server you were previously on went down, you have been connected to a fallback server
|
||||||
total_players=Total players online: {0}
|
total_players=Total players online: {0}
|
||||||
name_too_long=Cannot have username longer than 16 characters
|
name_too_long=Cannot have username longer than 16 characters
|
||||||
name_invalid=Username contains invalid characters.
|
name_invalid=Username contains invalid characters.
|
||||||
|
Loading…
Reference in New Issue
Block a user