pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Potential crash/bug fixes for Groups and Mercs.

Browse Source
This commit is contained in:
Trevius
2015-01-08 23:28:22 -06:00
parent 4808dcadcf
commit 4c9653d204
2 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/entity.cpp
+6 -4
View File
@@ -2033,8 +2033,9 @@ void EntityList::RemoveAllMercs()
void EntityList::RemoveAllGroups()
{
while (group_list.size()) {
safe_delete(group_list.front());
auto group = group_list.front();
group_list.pop_front();
delete group;
}
#if EQDEBUG >= 5
CheckGroupList (__FILE__, __LINE__);
@@ -2044,8 +2045,9 @@ void EntityList::RemoveAllGroups()
void EntityList::RemoveAllRaids()
{
while (raid_list.size()) {
safe_delete(raid_list.front());
auto raid = raid_list.front();
raid_list.pop_front();
delete raid;
}
}
@@ -2256,8 +2258,8 @@ bool EntityList::RemoveGroup(uint32 delete_id)
while(iterator != group_list.end())
{
if((*iterator)->GetID() == delete_id) {
safe_delete(*iterator);
group_list.remove(*iterator);
delete *iterator;
#if EQDEBUG >= 5
CheckGroupList (__FILE__, __LINE__);
#endif
@@ -2280,8 +2282,8 @@ bool EntityList::RemoveRaid(uint32 delete_id)
while(iterator != raid_list.end())
{
if((*iterator)->GetID() == delete_id) {
safe_delete(*iterator);
raid_list.remove(*iterator);
delete *iterator;
return true;
}
++iterator;