From 0fe162a54aecee86c45dbb2d2411219a0e7182f9 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Tue, 26 Mar 2019 02:51:45 +0800
Subject: [PATCH] Update server version

---
 data/stk_config.xml           | 2 +-
 src/network/server_config.cpp | 4 ++--
 src/network/server_config.hpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/stk_config.xml b/data/stk_config.xml
index 0e0a4b700..14c143bdb 100644
--- a/data/stk_config.xml
+++ b/data/stk_config.xml
@@ -11,7 +11,7 @@
 
   <!-- Minimum and maxium server versions that be be read by this binary.
        Older versions will be ignored. -->
-  <server-version min="5" max="5"/>
+  <server-version min="6" max="6"/>
 
   <!-- Maximum number of karts to be used at the same time. This limit
        can easily be increased, but some tracks might not have valid start
diff --git a/src/network/server_config.cpp b/src/network/server_config.cpp
index 8ba52b05e..8be42df69 100644
--- a/src/network/server_config.cpp
+++ b/src/network/server_config.cpp
@@ -145,7 +145,7 @@ void loadServerConfigXML(const XMLNode* root, bool default_config)
         return;
     }
 
-    int config_file_version = -1;
+    /*int config_file_version = -1;
     if (root->get("version", &config_file_version) < 1 ||
         config_file_version < stk_config->m_min_server_version ||
         config_file_version > stk_config->m_max_server_version)
@@ -155,7 +155,7 @@ void loadServerConfigXML(const XMLNode* root, bool default_config)
         delete root;
         writeServerConfigToDisk();
         return;
-    }
+    }*/
 
     for (unsigned i = 0; i < g_server_params.size(); i++)
         g_server_params[i]->findYourDataInAChildOf(root);
diff --git a/src/network/server_config.hpp b/src/network/server_config.hpp
index 8c20fa7e2..056a90693 100644
--- a/src/network/server_config.hpp
+++ b/src/network/server_config.hpp
@@ -326,7 +326,7 @@ namespace ServerConfig
 
     // ========================================================================
     /** Server version, will be advanced if there are protocol changes. */
-    static const uint32_t m_server_version = 5;
+    static const uint32_t m_server_version = 6;
     // ========================================================================
     void loadServerConfig(const std::string& path = "");
     // ------------------------------------------------------------------------