diff options
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index ed782815fd3..d13f4ace139 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -52,7 +52,7 @@ #include "QueryPackets.h" #include "QuestDef.h" #include "Random.h" -#include "Realm.h" +#include "RealmList.h" #include "ReputationMgr.h" #include "ScriptMgr.h" #include "ScriptReloadMgr.h" @@ -8728,8 +8728,9 @@ bool ObjectMgr::IsReservedName(std::string_view name) const static EnumFlag<CfgCategoriesCharsets> GetRealmLanguageType(bool create) { - if (Cfg_CategoriesEntry const* category = sCfgCategoriesStore.LookupEntry(realm.Timezone)) - return create ? category->GetCreateCharsetMask() : category->GetExistingCharsetMask(); + if (std::shared_ptr<Realm const> currentRealm = sRealmList->GetCurrentRealm()) + if (Cfg_CategoriesEntry const* category = sCfgCategoriesStore.LookupEntry(currentRealm->Timezone)) + return create ? category->GetCreateCharsetMask() : category->GetExistingCharsetMask(); return create ? CfgCategoriesCharsets::English : CfgCategoriesCharsets::Any; // basic-Latin at create, any at login } |