Part 1: Merge branch 'master' into 4.3.4

This commit is contained in:
Shauren committed 2014-07-19 13:40:14 +02:00
1 parent 909acdbac3
commit 3e56a4b8d7
10 files changed
+53 -92

No files matched your search

+1 -2
View File
@@ -270,7 +270,6 @@ void WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
recvPacket.ReadBit();
uint32 accountNameLength = recvPacket.ReadBits(12);
account = recvPacket.ReadString(accountNameLength);
if (sWorld->IsClosed())
{
SendAuthResponseError(AUTH_REJECT);
@@ -463,7 +462,7 @@ void WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
_worldSession->LoadGlobalAccountData();
_worldSession->LoadTutorialsData();
_worldSession->ReadAddonsInfo(recvPacket);
_worldSession->ReadAddonsInfo(addonsData);
_worldSession->LoadPermissions();
// At this point, we can safely hook a successful login