public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/ObjectAcessor): Fix crash caused by forced character renames (#13527)

Browse Source
This commit is contained in:
Skjalf
2022-10-24 12:24:23 -03:00
committed by GitHub
parent c54d56c7d0
commit e55d7cb951
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/game/Globals/ObjectAccessor.cpp
View File

@@ -100,6 +100,11 @@ namespace PlayerNameMapHolder
PlayerNameMap.erase(p->GetName()); PlayerNameMap.erase(p->GetName());
} }
void RemoveByName(std::string const& name)
{
PlayerNameMap.erase(name);
}
Player* Find(std::string const& name) Player* Find(std::string const& name)
{ {
std::string charName(name); std::string charName(name);
@@ -290,3 +295,9 @@ void ObjectAccessor::RemoveObject(Player* player)
HashMapHolder<Player>::Remove(player); HashMapHolder<Player>::Remove(player);
PlayerNameMapHolder::Remove(player); PlayerNameMapHolder::Remove(player);
} }
void ObjectAccessor::UpdatePlayerNameMapReference(std::string oldname, Player* player)
{
PlayerNameMapHolder::RemoveByName(oldname);
PlayerNameMapHolder::Insert(player);
}

2
src/server/game/Globals/ObjectAccessor.h
View File

@@ -106,6 +106,8 @@ namespace ObjectAccessor
template<> template<>
void RemoveObject(Player* player); void RemoveObject(Player* player);
void UpdatePlayerNameMapReference(std::string oldname, Player* player);
} }
#endif #endif

2
src/server/scripts/Commands/cs_character.cpp
View File

@@ -381,6 +381,8 @@ public:
{ {
target->SetName(newName); target->SetName(newName);
ObjectAccessor::UpdatePlayerNameMapReference(player->GetName(), target);
if (WorldSession* session = target->GetSession()) if (WorldSession* session = target->GetSession())
session->KickPlayer("HandleCharacterRenameCommand GM Command renaming character"); session->KickPlayer("HandleCharacterRenameCommand GM Command renaming character");
} }