ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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());
}
void RemoveByName(std::string const& name)
{
PlayerNameMap.erase(name);
}
Player* Find(std::string const& name)
{
std::string charName(name);
@ -290,3 +295,9 @@ void ObjectAccessor::RemoveObject(Player* player)
HashMapHolder<Player>::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<>
void RemoveObject(Player* player);
void UpdatePlayerNameMapReference(std::string oldname, Player* player);
}
#endif

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

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