From afc02082e6669e37ff131fedd48d9b25f94de02e Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 17 Feb 2016 10:34:04 +1100 Subject: [PATCH] Make it clear when users connected Bungee to itself. --- .../java/net/md_5/bungee/connection/InitialHandler.java | 8 ++++---- proxy/src/main/resources/messages.properties | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java index ce78e198..bcc6f9ae 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -328,7 +328,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection // We can just check by UUID here as names are based on UUID if ( !isOnlineMode() && bungee.getPlayer( getUniqueId() ) != null ) { - disconnect( bungee.getTranslation( "already_connected" ) ); + disconnect( bungee.getTranslation( "already_connected_proxy" ) ); return; } @@ -424,14 +424,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection if ( oldName != null ) { // TODO See #1218 - oldName.disconnect( bungee.getTranslation( "already_connected" ) ); + oldName.disconnect( bungee.getTranslation( "already_connected_proxy" ) ); } // And then also for their old UUID ProxiedPlayer oldID = bungee.getPlayer( getUniqueId() ); if ( oldID != null ) { // TODO See #1218 - oldID.disconnect( bungee.getTranslation( "already_connected" ) ); + oldID.disconnect( bungee.getTranslation( "already_connected_proxy" ) ); } } else { @@ -440,7 +440,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection if ( oldName != null ) { // TODO See #1218 - disconnect( bungee.getTranslation( "already_connected" ) ); + disconnect( bungee.getTranslation( "already_connected_proxy" ) ); return; } diff --git a/proxy/src/main/resources/messages.properties b/proxy/src/main/resources/messages.properties index 2e613ea2..7875037c 100644 --- a/proxy/src/main/resources/messages.properties +++ b/proxy/src/main/resources/messages.properties @@ -1,5 +1,6 @@ alert=\u00a78[\u00a74Alert\u00a78]\u00a7r already_connected=\u00a7cYou are already connected to this server! +already_connected_proxy=\u00a7cYou are already connected to this proxy! already_connecting=\u00a7cAlready connecting to this server! command_list=\u00a7a[{0}] \u00a7e({1}): \u00a7r{2} connect_kick=\u00a7cKicked whilst connecting to {0}: {1}