From 9fa78b7387ec6eb5f6e3419d37ae631085c69e1a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Lo=C3=AFc=20Blot?= <nerzhul@users.noreply.github.com>
Date: Sat, 30 Sep 2017 16:41:18 +0200
Subject: [PATCH] game.cpp: remove dead code for proto v25 compat (#6481)

Protocol v25 is not supported anymore
---
 src/game.cpp | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index f2a76d763..35d0aa9f9 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2183,27 +2183,8 @@ bool Game::connectToServer(const std::string &playername,
 
 			wait_time += dtime;
 			// Only time out if we aren't waiting for the server we started
-			if ((!address->empty()) && (wait_time > 10)) {
-				bool sent_old_init = g_settings->getFlag("send_pre_v25_init");
-				// If no pre v25 init was sent, and no answer was received,
-				// but the low level connection could be established
-				// (meaning that we have a peer id), then we probably wanted
-				// to connect to a legacy server. In this case, tell the user
-				// to enable the option to be able to connect.
-				if (!sent_old_init &&
-						(client->getProtoVersion() == 0) &&
-						client->connectedToServer()) {
-					*error_message = "Connection failure: init packet not "
-					"recognized by server.\n"
-					"Most likely the server uses an old protocol version (<v25).\n"
-					"Please ask the server owner to update to 0.4.13 or later.\n"
-					"To still connect to the server in the meantime,\n"
-					"you can enable the 'send_pre_v25_init' setting by editing minetest.conf,\n"
-					"or by enabling the 'Client -> Network -> Support older Servers'\n"
-					"entry in the advanced settings menu.";
-				} else {
-					*error_message = "Connection timed out.";
-				}
+			if (!address->empty() && wait_time > 10) {
+				*error_message = "Connection timed out.";
 				errorstream << *error_message << std::endl;
 				break;
 			}
-- 
2.25.1