aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Object
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-08-18 18:59:58 +0200
committerShauren <shauren.trinity@gmail.com>2024-08-18 18:59:58 +0200
commitc4b710446d62c95eb8124175203fa5f394912594 (patch)
treec0e64d7fe1b315a34df65e4c44f0ad3d8723edf4 /src/server/game/Entities/Object
parent88fea990ff1408b94076fb9dbd0c974908d6a731 (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
Diffstat (limited to 'src/server/game/Entities/Object')
-rw-r--r--src/server/game/Entities/Object/ObjectGuid.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Object/ObjectGuid.cpp b/src/server/game/Entities/Object/ObjectGuid.cpp
index 4b3c661ccaa..0c59aa0fe52 100644
--- a/src/server/game/Entities/Object/ObjectGuid.cpp
+++ b/src/server/game/Entities/Object/ObjectGuid.cpp
@@ -20,7 +20,7 @@
#include "Errors.h"
#include "Hash.h"
#include "Log.h"
-#include "Realm.h"
+#include "RealmList.h"
#include "Util.h"
#include "World.h"
#include <charconv>
@@ -815,7 +815,7 @@ static inline uint32 GetRealmIdForObjectGuid(uint32 realmId)
if (realmId)
return realmId;
- return realm.Id.Realm;
+ return sRealmList->GetCurrentRealmId().Realm;
}
ObjectGuid ObjectGuidFactory::CreateNull()