@@ -9340,6 +9340,13 @@ std::string ObjectMgr::GetRealmName(uint32 realmId) const
|
||||
return iter != _realmNameStore.end() ? iter->second : "";
|
||||
}
|
||||
|
||||
std::string ObjectMgr::GetNormalizedRealmName(uint32 realmId) const
|
||||
{
|
||||
std::string name = GetRealmName(realmId);
|
||||
name.erase(std::remove_if(name.begin(), name.end(), ::isspace), name.end());
|
||||
return name;
|
||||
}
|
||||
|
||||
void ObjectMgr::LoadGameObjectQuestItems()
|
||||
{
|
||||
uint32 oldMSTime = getMSTime();
|
||||
|
||||
@@ -1369,6 +1369,7 @@ class TC_GAME_API ObjectMgr
|
||||
void LoadRealmNames();
|
||||
|
||||
std::string GetRealmName(uint32 realm) const;
|
||||
std::string GetNormalizedRealmName(uint32 realm) const;
|
||||
|
||||
ExpansionRequirementContainer const& GetRaceExpansionRequirements() const { return _raceExpansionRequirementStore; }
|
||||
uint8 GetRaceExpansionRequirement(uint8 race) const
|
||||
|
||||
@@ -40,10 +40,9 @@ void WorldSession::SendAuthResponse(uint32 code, bool queued, uint32 queuePos)
|
||||
response.SuccessInfo->ActiveExpansionLevel = GetExpansion();
|
||||
response.SuccessInfo->VirtualRealmAddress = GetVirtualRealmAddress();
|
||||
|
||||
std::string realmName = sObjectMgr->GetRealmName(realm.Id.Realm);
|
||||
|
||||
// Send current home realm. Also there is no need to send it later in realm queries.
|
||||
response.SuccessInfo->VirtualRealms.emplace_back(GetVirtualRealmAddress(), true, false, realmName, realmName);
|
||||
response.SuccessInfo->VirtualRealms.emplace_back(GetVirtualRealmAddress(), true, false,
|
||||
sObjectMgr->GetRealmName(realm.Id.Realm), sObjectMgr->GetNormalizedRealmName(realm.Id.Realm));
|
||||
|
||||
if (HasPermission(rbac::RBAC_PERM_USE_CHARACTER_TEMPLATES))
|
||||
for (auto& templ : sObjectMgr->GetCharacterTemplates())
|
||||
|
||||
@@ -103,11 +103,9 @@ void WorldPackets::Party::PartyInvite::Initialize(Player* const inviter, int32 p
|
||||
|
||||
ProposedRoles = proposedRoles;
|
||||
|
||||
std::string realmName = sObjectMgr->GetRealmName(realm.Id.Realm);
|
||||
|
||||
InviterVirtualRealmAddress = GetVirtualRealmAddress();
|
||||
InviterRealmNameActual = realmName;
|
||||
InviterRealmNameNormalized = realmName;
|
||||
InviterRealmNameActual = sObjectMgr->GetRealmName(realm.Id.Realm);
|
||||
InviterRealmNameNormalized = sObjectMgr->GetNormalizedRealmName(realm.Id.Realm);
|
||||
}
|
||||
|
||||
void WorldPackets::Party::PartyInviteResponse::Read()
|
||||
|
||||
Reference in New Issue
Block a user