aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Guilds/Guild.cpp
diff options
context:
space:
mode:
authorUjp8LfXBJ6wCPR <github@lillecarl.com>2020-02-14 12:45:34 +0100
committerGitHub <noreply@github.com>2020-02-14 12:45:34 +0100
commit9264e5b6f0a03de7387c7ac6b27755b4ceee0426 (patch)
treec29adba9f8abd6fe7f5ce52803f8dc29c2db1c34 /src/server/game/Guilds/Guild.cpp
parentb92e4af460e72f8e6180cd5e6aac0250d64800e0 (diff)
Core/Misc: Remove redundant null pointer checks before delete (#24140)
* Identified by clang-tidy readability-delete-null-pointer
Diffstat (limited to 'src/server/game/Guilds/Guild.cpp')
-rw-r--r--src/server/game/Guilds/Guild.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 88f08676bd2..5dcfeac8c2c 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -2400,9 +2400,12 @@ void Guild::DeleteMember(SQLTransaction& trans, ObjectGuid guid, bool isDisbandi
// 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(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 !!
if (player)