From c5715f1f14d43a3118db6785f051fe8d49c0b909 Mon Sep 17 00:00:00 2001
From: Chris Miles <akkadius1@gmail.com>
Date: Mon, 3 Mar 2025 00:13:00 -0600
Subject: [PATCH] [Crash] Fix Aura process crash with bots (#4743)

---
 zone/client.cpp | 3 +++
 zone/mob.cpp    | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/zone/client.cpp b/zone/client.cpp
index d4b38d622..7e8a8cd7c 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -708,6 +708,9 @@ Client::Client(EQStreamInterface *ieqs) : Mob(
 }
 
 Client::~Client() {
+	entity_list.RemoveMobFromCloseLists(this);
+	m_close_mobs.clear();
+
 	if (ClientVersion() == EQ::versions::ClientVersion::RoF2 && RuleB (Parcel, EnableParcelMerchants)) {
 		DoParcelCancel();
 	}
diff --git a/zone/mob.cpp b/zone/mob.cpp
index ed6f9a164..9ac841e2d 100644
--- a/zone/mob.cpp
+++ b/zone/mob.cpp
@@ -531,6 +531,9 @@ Mob::Mob(
 
 Mob::~Mob()
 {
+	entity_list.RemoveMobFromCloseLists(this);
+	m_close_mobs.clear();
+
 	quest_manager.stopalltimers(this);
 
 	mMovementManager->RemoveMob(this);
@@ -570,11 +573,8 @@ Mob::~Mob()
 	entity_list.UnMarkNPC(GetID());
 	UninitializeBuffSlots();
 
-	entity_list.RemoveMobFromCloseLists(this);
 	entity_list.RemoveAuraFromMobs(this);
 
-	m_close_mobs.clear();
-
 	ClearDataBucketCache();
 
 	LeaveHealRotationTargetPool();