nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 10:30:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Remove redundant null pointer checks before delete (#2679)

Browse Source 
Co-authored-by: Ujp8LfXBJ6wCPR <github@lillecarl.com>

Co-authored-by: Ujp8LfXBJ6wCPR <github@lillecarl.com>
This commit is contained in:
Viste
2020-02-20 20:33:28 +03:00
committed by GitHub
parent 0cabb8e7e1
commit a7970b711a
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/game/Guilds/Guild.cpp
View File

@@ -2320,9 +2320,12 @@ void Guild::DeleteMember(uint64 guid, bool isDisbanding, bool isKicked, bool can
// Call script on remove before member is actually removed from guild (and database)
sScriptMgr->OnGuildRemoveMember(this, player, isDisbanding, isKicked);
if (Member* member = GetMember(guid))
delete member;
m_members.erase(lowguid);
auto memberItr = m_members.find(lowguid);
if (memberItr != m_members.end())
{
delete memberItr->second;
m_members.erase(memberItr);
}
// If player not online data in data field will be loaded from guild tabs no need to update it !!
if (player)