From 98b137154ab58f76ad67b91dcf99726344187df4 Mon Sep 17 00:00:00 2001
From: Chris Miles <akkadius1@gmail.com>
Date: Fri, 24 May 2024 20:54:10 -0500
Subject: [PATCH] [Crash] Add validation to RemoveXTarget (#4324)

---
 zone/client.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/zone/client.cpp b/zone/client.cpp
index cdfaaca5d..036c4b56e 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -6994,6 +6994,10 @@ void Client::AddAutoXTarget(Mob *m, bool send)
 
 void Client::RemoveXTarget(Mob *m, bool OnlyAutoSlots)
 {
+	if (!XTargettingAvailable() || !m || !m_activeautohatermgr) {
+		return;
+	}
+
 	m_activeautohatermgr->decrement_count(m);
 	// now we may need to clean up our CurrentTargetNPC entries
 	for (int i = 0; i < GetMaxXTargets(); ++i) {