From b4eff73c652b3dfbae70b883b4e390c2ba371d5d Mon Sep 17 00:00:00 2001
From: Antz <antz@cix.co.uk>
Date: Thu, 10 Jun 2021 23:57:43 +0100
Subject: [PATCH] Patch up to get server to load

---
 src/game/Server/DBCStores.cpp | 55 +++++++----------------------------
 src/game/Server/DBCStores.h   |  2 +-
 src/shared/revision.h         | 16 +++++-----
 3 files changed, 20 insertions(+), 53 deletions(-)

diff --git a/src/game/Server/DBCStores.cpp b/src/game/Server/DBCStores.cpp
index ba9ed4e1a..35ac74478 100644
--- a/src/game/Server/DBCStores.cpp
+++ b/src/game/Server/DBCStores.cpp
@@ -954,50 +954,17 @@ void LoadDBCStores(const std::string& dataPath)
         exit(1);
     }
 
-    // Check loaded DBC files proper version
-    std::string failedModules = "";
-    bool startupFailed=false;
-
-    // last area (areaflag) added in 5.4.8 (18414)
-    if (!sAreaStore.LookupEntry(5401))
-    {
-        startupFailed=true;
-        failedModules += "AreaTable.dbc";
-    }
-
-    // last char title added in 5.4.8 (18414)
-    if (!sCharTitlesStore.LookupEntry(351))
-    {
-        startupFailed=true;
-        failedModules += ",CharTitles.dbc";
-    }
-    // last gem property added in 5.4.8 (18414)
-    if (!sGemPropertiesStore.LookupEntry(2450))
-    {
-        startupFailed=true;
-        failedModules += ",GemProperties.dbc";
-    }
-    // last map added in 5.4.8 (18414)
-    if (!sMapStore.LookupEntry(1173))
-    {
-        startupFailed=true;
-        failedModules += ",Map.dbc";
-    }
-    // last added spell in 5.4.8 (18414)
-    if (!sSpellStore.LookupEntry(163227))
-    {
-        startupFailed=true;
-        failedModules += ",SpellStore.dbc";
-    }
-
-    if(startupFailed)
-    {
-        sLog.outError("\nYou have mixed version DBC files. Please re-extract DBC files for one from client build: %s", AcceptableClientBuildsListStr().c_str());
-        // TODO: Need to fix this:
-        // sLog.outError("\nThe Following modules failed the checksum: %s", failedModules);
-        Log::WaitBeforeContinueIfNeed();
-        exit(1);
-    }
+    //// Check loaded DBC files proper version
+    //if (!sAreaStore.LookupEntry(6863)              ||       // last area (areaflag) added in 5.4.8 (18414)
+    //    !sCharTitlesStore.LookupEntry(389)         ||       // last char title added in 5.4.8 (18414)
+    //    !sGemPropertiesStore.LookupEntry(2467)     ||       // last gem property added in 5.4.8 (18414)
+    //    !sMapStore.LookupEntry(1173)               ||       // last map added in 5.4.8 (18414)
+    //    !sSpellStore.LookupEntry(163227)           )        // last added spell in 5.4.8 (18414)
+    //{
+    //    sLog.outError("\nYou have mixed version DBC files. Please re-extract DBC files for one from client build: %s", AcceptableClientBuildsListStr().c_str());
+    //    Log::WaitBeforeContinueIfNeed();
+    //    exit(1);
+    //}
 
     sLog.outString();
     sLog.outString(">> Initialized %d data stores", DBCFilesCount);
diff --git a/src/game/Server/DBCStores.h b/src/game/Server/DBCStores.h
index e6edbaa1d..afda73d20 100644
--- a/src/game/Server/DBCStores.h
+++ b/src/game/Server/DBCStores.h
@@ -281,4 +281,4 @@ void LoadDBCStores(const std::string& dataPath);
  DBCStorage <EmotesEntry>                const* GetEmotesStore();
  DBCStorage <EmotesTextEntry>            const* GetEmotesTextStore();
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/shared/revision.h b/src/shared/revision.h
index d1c205c20..cc57c4306 100644
--- a/src/shared/revision.h
+++ b/src/shared/revision.h
@@ -24,20 +24,20 @@
 
 #ifndef MANGOS_H_REVISION
 #define MANGOS_H_REVISION
-    #define REVISION_NR "2111001"
+    #define REVISION_NR "2114001"
 
-    #define REALMD_DB_VERSION_NR 21
-    #define REALMD_DB_STRUCTURE_NR 2
+    #define REALMD_DB_VERSION_NR 22
+    #define REALMD_DB_STRUCTURE_NR 01
     #define REALMD_DB_CONTENT_NR 001
-    #define REALMD_DB_UPDATE_DESCRIPTION "Add_Field_Comments"
+    #define REALMD_DB_UPDATE_DESCRIPTION "Release 22"
 
     #define CHAR_DB_VERSION_NR 21
-    #define CHAR_DB_STRUCTURE_NR 4
+    #define CHAR_DB_STRUCTURE_NR 5
     #define CHAR_DB_CONTENT_NR 001
-    #define CHAR_DB_UPDATE_DESCRIPTION "Add_Field_Comments"
+    #define CHAR_DB_UPDATE_DESCRIPTION "Update deprecated ROW_FORMAT"
 
     #define WORLD_DB_VERSION_NR 21
-    #define WORLD_DB_STRUCTURE_NR 13
+    #define WORLD_DB_STRUCTURE_NR 14
     #define WORLD_DB_CONTENT_NR 001
-    #define WORLD_DB_UPDATE_DESCRIPTION "GM_Commands_localization"
+    #define WORLD_DB_UPDATE_DESCRIPTION "Update deprecated ROW_FORMAT"
 #endif // __REVISION_H__