Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Identified by clang-tidy readability-delete-null-pointer

(cherry picked from commit 9264e5b6f0)
This commit is contained in:
Ujp8LfXBJ6wCPR
2020-02-14 12:45:34 +01:00
committed by Shauren
parent 881f1907b3
commit 42ce97a74c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2792,9 +2792,12 @@ void Guild::DeleteMember(CharacterDatabaseTransaction& trans, ObjectGuid guid, b
// Call script on remove before member is actually removed from guild (and database)
sScriptMgr->OnGuildRemoveMember(this, guid, isDisbanding, isKicked);
if (Member* member = GetMember(guid))
delete member;
m_members.erase(guid);
auto memberItr = m_members.find(guid);
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 !!
Player* player = ObjectAccessor::FindConnectedPlayer(guid);