Merge pull request #5918 from GyxTom/master

Core/Misc: Various cleanups
2012-03-28 18:00:42 -07:00
parent 72d3e856de 1544b208da
commit a08cb234c0
86 changed files with 653 additions and 547 deletions
@@ -207,6 +207,7 @@ bool World::RemoveSession(uint32 id)
    {
        if (itr->second->PlayerLoading())
            return false;
+
        itr->second->KickPlayer();
    }

@@ -218,8 +219,7 @@ void World::AddSession(WorldSession* s)
    addSessQueue.add(s);
 }

-void
-World::AddSession_(WorldSession* s)
+void World::AddSession_(WorldSession* s)
 {
    ASSERT (s);

@@ -272,11 +272,8 @@ World::AddSession_(WorldSession* s)
    }

    s->SendAuthResponse(AUTH_OK, true);
-
    s->SendAddonsInfo();
-
    s->SendClientCacheVersion(sWorld->getIntConfig(CONFIG_CLIENTCACHE_VERSION));
-
    s->SendTutorialsData();

    UpdateMaxSessionCounters();