Merge pull request #198 from SpigotMC/master

SpigotMC#2378: Show supported servers in incorrect client kick messages
HexagonMC · Mar 8, 2018 · b5f17e7 · b5f17e7
2 parents 068f8c9 + 7ee0b6d
commit b5f17e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -142,7 +142,7 @@ public void handle(PluginMessage pluginMessage) throws Exception
     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 void handle(Handshake handshake) throws Exception
                 {
                     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
@@ -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]