Merge pull request #5337 from LiMCrosS/patch-1

Core/World: WorldState must be loaded before Conditions
This commit is contained in:
Machiavelli
2012-02-21 02:18:39 -08:00

View File

@@ -1590,6 +1590,9 @@ void World::SetInitialWorldSettings()
sLog->outString("Loading Creature Formations...");
FormationMgr::LoadCreatureFormations();
sLog->outString("Loading World States..."); // must be loaded before battleground, outdoor PvP and conditions
LoadWorldStates();
sLog->outString("Loading Conditions...");
sConditionMgr->LoadConditions();
@@ -1717,9 +1720,6 @@ void World::SetInitialWorldSettings()
sTicketMgr->Initialize();
sLog->outString("Loading World States..."); // must be loaded before battleground and outdoor PvP
LoadWorldStates();
///- Initialize Battlegrounds
sLog->outString("Starting Battleground System");
sBattlegroundMgr->CreateInitialBattlegrounds();