From a55d37c91ec0e7d7b2fc45c758e00677e9ba3584 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Sun, 19 Feb 2023 02:13:58 -0500
Subject: [PATCH] Core/Misc: Mention vmaps in error message about loading
 gameobject models

Port From (https://github.com/TrinityCore/TrinityCore/commit/d5ec4a7f05f34386cc76b7fe7c289d148d69a43d)
---
 Source/Game/World/WorldManager.cs        | 14 +++++++-------
 Source/WorldServer/WorldServer.conf.dist |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/Game/World/WorldManager.cs b/Source/Game/World/WorldManager.cs
index d34064045..6cd84dc99 100644
--- a/Source/Game/World/WorldManager.cs
+++ b/Source/Game/World/WorldManager.cs
@@ -425,6 +425,13 @@ namespace Game
                 Environment.Exit(1);
             }
 
+            Log.outInfo(LogFilter.ServerLoading, "Loading GameObject models...");
+            if (!GameObjectModel.LoadGameObjectModelList())
+            {
+                Log.outFatal(LogFilter.ServerLoading, "Unable to load gameobject models (part of vmaps), objects using WMO models will crash the client - server shutting down!");
+                Environment.Exit(1);
+            }
+
             Log.outInfo(LogFilter.ServerLoading, "Loading hotfix blobs...");
             Global.DB2Mgr.LoadHotfixBlob(m_availableDbcLocaleMask);
 
@@ -496,13 +503,6 @@ namespace Game
             Log.outInfo(LogFilter.ServerLoading, "Loading languages words...");
             Global.LanguageMgr.LoadLanguagesWords();
 
-            Log.outInfo(LogFilter.ServerLoading, "Loading GameObject models...");
-            if (!GameObjectModel.LoadGameObjectModelList())
-            {
-                Log.outFatal(LogFilter.ServerLoading, "Unable to load gameobject models, objects using WMO models will crash the client - server shutting down!");                
-                Environment.Exit(1);
-            }
-
             Log.outInfo(LogFilter.ServerLoading, "Loading Instance Template...");
             Global.ObjectMgr.LoadInstanceTemplate();
 
diff --git a/Source/WorldServer/WorldServer.conf.dist b/Source/WorldServer/WorldServer.conf.dist
index 3c14822ba..8c67e9b18 100644
--- a/Source/WorldServer/WorldServer.conf.dist
+++ b/Source/WorldServer/WorldServer.conf.dist
@@ -418,7 +418,7 @@ mmap.EnablePathFinding = 1
 #
 #    vmap.enableLOS
 #    vmap.enableHeight
-#        Description: VMmap support for line of sight and height calculation.
+#        Description: Vmap support for line of sight and height calculation.
 #        Default:     1 - (Enabled, vmap.enableLOS)
 #                     1 - (Enabled, vmap.enableHeight)
 #                     0 - (Disabled)