Merge pull request #5865 from Elron103/pull-requests4

Core/Spells: Fix loading order and apply custom spell flags correctly

1 files changed, 3 insertions, 3 deletions

diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 13f2f1b44b8..3c64f7de506 100755
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1283,6 +1283,9 @@ void World::SetInitialWorldSettings()
     sLog->outString("Loading SpellInfo store...");
     sSpellMgr->LoadSpellInfoStore();
 
+    sLog->outString("Loading SkillLineAbilityMultiMap Data...");
+    sSpellMgr->LoadSkillLineAbilityMap();
+
     sLog->outString("Loading spell custom attributes...");
     sSpellMgr->LoadSpellCustomAttr();
 
@@ -1295,9 +1298,6 @@ void World::SetInitialWorldSettings()
     sLog->outString("Loading Instance Template...");
     sObjectMgr->LoadInstanceTemplate();
 
-    sLog->outString("Loading SkillLineAbilityMultiMap Data...");
-    sSpellMgr->LoadSkillLineAbilityMap();
-
     // Must be called before `creature_respawn`/`gameobject_respawn` tables
     sLog->outString("Loading instances...");
     sInstanceSaveMgr->LoadInstances();