Core/PacketIO: Properly send normalized realm names

Ref #14949
This commit is contained in:
DDuarte
2016-03-28 23:10:44 +01:00
parent adc7b5e1f1
commit 7f8cd123c4
4 changed files with 12 additions and 7 deletions
+7
View File
@@ -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();
+1
View File
@@ -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
+2 -3
View File
@@ -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()