PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Close #963 - log remote ping errors to console, friendly message to clients.

Browse Source
This commit is contained in:
md_5 2014-04-19 19:48:43 +10:00
parent 6475385f87
commit 312a74c5f1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
View File

@ -162,7 +162,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
if ( error != null ) if ( error != null )
{ {
result = new ServerPing(); result = new ServerPing();
result.setDescription( "Error pinging remote server: " + Util.exception( error ) ); result.setDescription( bungee.getTranslation( "ping_cannot_connect" ) );
bungee.getLogger().log( Level.WARNING, "Error pinging remote server", error );
} }
result = bungee.getPluginManager().callEvent( new ProxyPingEvent( InitialHandler.this, result ) ).getResponse(); result = bungee.getPluginManager().callEvent( new ProxyPingEvent( InitialHandler.this, result ) ).getResponse();

1
proxy/src/main/resources/messages.properties
View File

@ -20,3 +20,4 @@ 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 the lobby
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
ping_cannot_connect=\u00a7c[Bungee] Can't connect to server.