pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-09 22:20:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1097 from SecretsOTheP/null_ptr_fixes

Browse Source 
Null ptr fixes
This commit is contained in:
Chris Miles
2020-08-16 02:02:46 -05:00
committed by GitHub
parent 6a4a4de31c 147916ce2e
commit ecf47a0bbb
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/entity.cpp
+4 -4
View File
@@ -2476,7 +2476,7 @@ void EntityList::RemoveAllGroups()
while (group_list.size()) {
auto group = group_list.front();
group_list.pop_front();
delete group;
safe_delete(group);
}
#if EQDEBUG >= 5
CheckGroupList (__FILE__, __LINE__);
@@ -2488,7 +2488,7 @@ void EntityList::RemoveAllRaids()
while (raid_list.size()) {
auto raid = raid_list.front();
raid_list.pop_front();
delete raid;
safe_delete(raid);
}
}
@@ -2837,7 +2837,7 @@ bool EntityList::RemoveGroup(uint32 delete_id)
}
auto group = *it;
group_list.erase(it);
delete group;
safe_delete(group);
return true;
}
@@ -2849,7 +2849,7 @@ bool EntityList::RemoveRaid(uint32 delete_id)
return false;
auto raid = *it;
raid_list.erase(it);
delete raid;
safe_delete(raid);
return true;
}