Core/DataStores: Delay building all DB2Manager containers after loading hotfix data to ignore rows marked as deleted by hotfixes
Port From (https://github.com/TrinityCore/TrinityCore/commit/da1ac5aa73afdb7f2379b71761e2a6e855ce4e9a)
This commit is contained in:
@@ -415,6 +415,13 @@ namespace Game
|
||||
|
||||
DB.Login.Execute($"UPDATE realmlist SET icon = {(byte)server_type}, timezone = {realm_zone} WHERE id = '{Global.RealmMgr.GetCurrentRealmId().Index}'"); // One-time query
|
||||
|
||||
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!");
|
||||
return false;
|
||||
}
|
||||
|
||||
Log.outInfo(LogFilter.ServerLoading, "Initialize DataStorage...");
|
||||
// Load DB2s
|
||||
m_availableDbcLocaleMask = CliDB.LoadStores(_dataPath, m_defaultDbcLocale);
|
||||
@@ -424,13 +431,6 @@ namespace Game
|
||||
return false;
|
||||
}
|
||||
|
||||
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!");
|
||||
return false;
|
||||
}
|
||||
|
||||
Log.outInfo(LogFilter.ServerLoading, "Loading hotfix blobs...");
|
||||
Global.DB2Mgr.LoadHotfixBlob(m_availableDbcLocaleMask);
|
||||
|
||||
@@ -440,6 +440,9 @@ namespace Game
|
||||
Log.outInfo(LogFilter.ServerLoading, "Loading hotfix optional data...");
|
||||
Global.DB2Mgr.LoadHotfixOptionalData(m_availableDbcLocaleMask);
|
||||
|
||||
Log.outInfo(LogFilter.ServerLoading, "Indexing loaded data stores...");
|
||||
Global.DB2Mgr.IndexLoadedStores();
|
||||
|
||||
//- Load M2 fly by cameras
|
||||
M2Storage.LoadM2Cameras(_dataPath);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user