Merge

--HG--
branch : trunk

1 files changed, 4 insertions, 2 deletions

diff --git a/src/game/World.cpp b/src/game/World.cpp
index 92453ce1f52..c6d2bc9104a 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -257,6 +257,8 @@ World::AddSession_ (WorldSession* s)
     s->SendPacket (&packet);
 
     s->SendAddonsInfo();
+    s->SendTutorialsData();
+
     UpdateMaxSessionCounters ();
 
     // Updates the population
@@ -1752,11 +1754,11 @@ void World::Update(uint32 diff)
     ///- Update objects when the timer has passed (maps, transport, creatures,...)
     MapManager::Instance().Update(diff);                // As interval = 0
 
-    if(m_timers[WUPDATE_OBJECTS].Passed())
+    /*if(m_timers[WUPDATE_OBJECTS].Passed())
     {
         m_timers[WUPDATE_OBJECTS].Reset();
         MapManager::Instance().DoDelayedMovesAndRemoves();
-    }
+    }*/
 
     ///- Process necessary scripts
     if (!m_scriptSchedule.empty())