From 7ee0b6dccb4d5269f239321f6d1b6b6c36dc16c3 Mon Sep 17 00:00:00 2001 From: Mystiflow Date: Wed, 7 Mar 2018 02:29:43 +0000 Subject: [PATCH] #2378: Show supported servers in incorrect client kick messages This makes the message match vanilla Minecraft servers --- .../java/net/md_5/bungee/connection/InitialHandler.java | 6 +++--- proxy/src/main/resources/messages.properties | 4 ++-- 2 files changed, 5 insertions(+), 5 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 e596f822..559787ee 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 @@ -142,7 +142,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection public void handle(LegacyHandshake legacyHandshake) throws Exception { this.legacy = true; - ch.close( bungee.getTranslation( "outdated_client" ) ); + ch.close( bungee.getTranslation( "outdated_client", bungee.getGameVersion() ) ); } @Override @@ -301,10 +301,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection { if ( handshake.getProtocolVersion() > bungee.getProtocolVersion() ) { - disconnect( bungee.getTranslation( "outdated_server" ) ); + disconnect( bungee.getTranslation( "outdated_server", bungee.getGameVersion() ) ); } else { - disconnect( bungee.getTranslation( "outdated_client" ) ); + disconnect( bungee.getTranslation( "outdated_client", bungee.getGameVersion() ) ); } return; } diff --git a/proxy/src/main/resources/messages.properties b/proxy/src/main/resources/messages.properties index 59c17ea8..84405e99 100644 --- a/proxy/src/main/resources/messages.properties +++ b/proxy/src/main/resources/messages.properties @@ -12,8 +12,8 @@ mojang_fail=Error occurred while contacting login servers, are they down? no_permission=\u00a7cYou do not have permission to execute this command! no_server=\u00a7cThe specified server does not exist. no_server_permission=\u00a7cYou don't have permission to access this server. -outdated_client=Outdated Client! -outdated_server=Outdated Server! +outdated_client=Outdated client! Please use {0} +outdated_server=Outdated server! I'm still on {0} proxy_full=Server is full! restart=[Proxy] Proxy restarting. server_kick=[Kicked]