From 6256660972321914cdbabb0a1731528eb51e5616 Mon Sep 17 00:00:00 2001 From: Uleat Date: Wed, 19 Jun 2019 20:01:57 -0400 Subject: [PATCH] Fix for possible memory leak with mercenaries and bots --- zone/entity.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zone/entity.cpp b/zone/entity.cpp index ad8d1fb1b..1b636d329 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -509,16 +509,16 @@ void EntityList::MobProcess() } if(mob_dead) { - if(mob->IsNPC()) { - entity_list.RemoveNPC(id); - } - else if(mob->IsMerc()) { + if(mob->IsMerc()) { entity_list.RemoveMerc(id); -#ifdef BOTS } +#ifdef BOTS else if(mob->IsBot()) { entity_list.RemoveBot(id); + } #endif + else if(mob->IsNPC()) { + entity_list.RemoveNPC(id); } else { #ifdef _WINDOWS