Merge pull request #5865 from Elron103/pull-requests4

Core/Spells: Fix loading order and apply custom spell flags correctly
This commit is contained in:
Shauren
2012-03-24 05:52:35 -07:00

View File

@@ -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();