From 1a857d382ae7bb08d331ee830220343304879b9f Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sat, 30 May 2009 14:48:13 -0500
Subject: *Start game event system before init bg and opvp in case that bg and
 opvp needs to start some game events.

--HG--
branch : trunk
---
 src/game/World.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/game/World.cpp b/src/game/World.cpp
index 1c3200f8351..563ee500d5f 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -1521,6 +1521,10 @@ void World::SetInitialWorldSettings()
     sLog.outString( "Starting Map System" );
     MapManager::Instance().Initialize();
 
+    sLog.outString("Starting Game Event system..." );
+    uint32 nextGameEvent = gameeventmgr.Initialize();
+    m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent);    //depend on next event
+
     ///- Initialize Battlegrounds
     sLog.outString( "Starting BattleGround System" );
     sBattleGroundMgr.CreateInitialBattleGrounds();
@@ -1546,10 +1550,6 @@ void World::SetInitialWorldSettings()
     sLog.outString("Starting objects Pooling system..." );
     poolhandler.Initialize();
 
-    sLog.outString("Starting Game Event system..." );
-    uint32 nextGameEvent = gameeventmgr.Initialize();
-    m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent);    //depend on next event
-
     sLog.outString("Initialize AuctionHouseBot...");
     AuctionHouseBotInit();
 
-- 
cgit v1.2.3