diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-08-18 18:59:58 +0200 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-08-18 20:39:21 +0200 |
| commit | 25ffdbc5ef0859aeaadfa132329a498e86827e68 (patch) | |
| tree | d7df51da8cdc3e3df7c50e5058803f9324715ee4 /src/server/game/Services/ClubUtils.cpp | |
| parent | 0c98004896cb91ef2d22baa5569ff0e0d6cd15ee (diff) | |
Core/Realms: Realmlist refactors
* Removed global realm variable from World and use RealmList everywhere
* Match auth build key with client version
* Restored allowedSecurityLevel checks for realmlist packet building
* Restored updating population field, mysteriously removed 15 years ago in f20b25d1c90f608deab28c9957b3b376ab2a0d50
(cherry picked from commit c4b710446d62c95eb8124175203fa5f394912594)
# Conflicts:
# sql/base/auth_database.sql
Diffstat (limited to 'src/server/game/Services/ClubUtils.cpp')
| -rw-r--r-- | src/server/game/Services/ClubUtils.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/game/Services/ClubUtils.cpp b/src/server/game/Services/ClubUtils.cpp index 7147b2367b1..ec85e4a4a7c 100644 --- a/src/server/game/Services/ClubUtils.cpp +++ b/src/server/game/Services/ClubUtils.cpp @@ -16,10 +16,9 @@ */ #include "ClubUtils.h" -#include "Realm.h" -#include "World.h" +#include "RealmList.h" uint64 Battlenet::Services::Clubs::CreateClubMemberId(ObjectGuid guid) { - return guid.GetCounter() | (uint64(realm.Id.Realm & 0xFFF) << 48); + return guid.GetCounter() | (uint64(sRealmList->GetCurrentRealmId().Realm & 0xFFF) << 48); } |