diff --git a/zone/entity.cpp b/zone/entity.cpp index 2a3429f02..52eb41165 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -2282,6 +2282,9 @@ bool EntityList::RemoveMob(uint16 delete_id) auto it = mob_list.find(delete_id); if (it != mob_list.end()) { + + RemoveMobFromClientCloseLists(it->second); + if (npc_list.count(delete_id)) entity_list.RemoveNPC(delete_id); else if (client_list.count(delete_id)) @@ -2304,6 +2307,8 @@ bool EntityList::RemoveMob(Mob *delete_mob) auto it = mob_list.begin(); while (it != mob_list.end()) { if (it->second == delete_mob) { + RemoveMobFromClientCloseLists(it->second); + safe_delete(it->second); if (!corpse_list.count(it->first)) free_ids.push(it->first);