pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 15:58:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some clean up related to the entity_list changes

Browse Source
This commit is contained in:
Michael Cook (mackal)
2014-02-10 12:16:14 -05:00
parent ce4f4995b5
commit 6a8a6e530b
4 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/entity.cpp
+4 -4
View File
@@ -2031,12 +2031,12 @@ bool EntityList::RemoveMob(uint16 delete_id)
auto it = mob_list.find(delete_id);
if (it != mob_list.end()) {
if (npc_list.find(delete_id) != npc_list.end())
if (npc_list.count(delete_id))
entity_list.RemoveNPC(delete_id);
else if (client_list.find(delete_id) != client_list.end())
else if (client_list.count(delete_id))
entity_list.RemoveClient(delete_id);
safe_delete(it->second);
if (corpse_list.find(delete_id) == corpse_list.end())
if (corpse_list.count(delete_id))
free_ids.push(it->first);
mob_list.erase(it);
return true;
@@ -2054,7 +2054,7 @@ bool EntityList::RemoveMob(Mob *delete_mob)
while (it != mob_list.end()) {
if (it->second == delete_mob) {
safe_delete(it->second);
if (corpse_list.find(it->first) == corpse_list.end())
if (corpse_list.count(it->first))
free_ids.push(it->first);
mob_list.erase(it);
return true;