Core/ObjectMgr: Load npc spellclick data after quests.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index aded5e9e22e..94bc4b4dc54 100755
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1363,12 +1363,6 @@ void World::SetInitialWorldSettings()
     sLog->outString("Loading Creature Template Addon Data...");
     sObjectMgr->LoadCreatureAddons();                            // must be after LoadCreatureTemplates() and LoadCreatures()
 
-    sLog->outString("Loading UNIT_NPC_FLAG_SPELLCLICK Data...");
-    sObjectMgr->LoadNPCSpellClickSpells();
-
-    sLog->outString("Loading Vehicle Accessories...");
-    sObjectMgr->LoadVehicleAccessories();                        // must be after LoadCreatureTemplates() and LoadNPCSpellClickSpells()
-
     sLog->outString("Loading Creature Respawn Data...");         // must be after PackInstances()
     sObjectMgr->LoadCreatureRespawnTimes();
 
@@ -1405,6 +1399,12 @@ void World::SetInitialWorldSettings()
     sLog->outString("Loading Game Event Data...");               // must be after loading pools fully
     sGameEventMgr->LoadFromDB();                                 // TODOLEAK: add scopes
 
+    sLog->outString("Loading UNIT_NPC_FLAG_SPELLCLICK Data...");
+    sObjectMgr->LoadNPCSpellClickSpells();
+
+    sLog->outString("Loading Vehicle Accessories...");
+    sObjectMgr->LoadVehicleAccessories();                        // must be after LoadCreatureTemplates() and LoadNPCSpellClickSpells()
+
     sLog->outString("Loading Dungeon boss data...");
     sObjectMgr->LoadInstanceEncounters();