From 42ce97a74c4ef77303215af190498c80d84f92d4 Mon Sep 17 00:00:00 2001 From: Ujp8LfXBJ6wCPR Date: Fri, 14 Feb 2020 12:45:34 +0100 Subject: Core/Misc: Remove redundant null pointer checks before delete (#24140) * Identified by clang-tidy readability-delete-null-pointer (cherry picked from commit 9264e5b6f0a03de7387c7ac6b27755b4ceee0426) --- src/server/game/Guilds/Guild.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 9afa6b4b388..b4d83f433f0 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -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); -- cgit v1.2.3