Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp src/server/scripts/Northrend/zone_dalaran.cpp src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
This commit is contained in:
commit
e68d3b0937
71 files changed
+1036
-499
No files matched your search
@@ -759,13 +759,13 @@ bool AuthSession::_HandleRealmList()
|
||||
uint32 id = fields[0].GetUInt32();
|
||||
|
||||
// Update realm list if need
|
||||
sRealmList.UpdateIfNeed();
|
||||
sRealmList->UpdateIfNeed();
|
||||
|
||||
// Circle through realms in the RealmList and construct the return packet (including # of user characters in each realm)
|
||||
ByteBuffer pkt;
|
||||
|
||||
size_t RealmListSize = 0;
|
||||
for (RealmList::RealmMap::const_iterator i = sRealmList.begin(); i != sRealmList.end(); ++i)
|
||||
for (RealmList::RealmMap::const_iterator i = sRealmList->begin(); i != sRealmList->end(); ++i)
|
||||
{
|
||||
const Realm &realm = i->second;
|
||||
// don't work with realms which not compatible with the client
|
||||
|
||||
Reference in new issue
Block a user