movement handler deletion to main destroy proc

cmss13-devs · Nov 20, 2023 · a607814 · a607814
1 parent fd1373b
commit a607814
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
@@ -716,6 +716,8 @@
 
 	QDEL_NULL(iff_tag)
 
+	QDEL_NULL(ai_movement_handler)
+
 	if(hardcore)
 		attack_log?.Cut() // Completely clear out attack_log to limit mem usage if we fail to delete
 

diff --git a/code/modules/mob/living/carbon/xenomorph/ai/xeno_ai.dm b/code/modules/mob/living/carbon/xenomorph/ai/xeno_ai.dm
@@ -25,10 +25,6 @@
 	/// The actual cooldown declaration for forceful retargeting, reference forced_retarget_time for time in between checks
 	COOLDOWN_DECLARE(forced_retarget_cooldown)
 
-/mob/living/carbon/xenomorph/Destroy()
-	QDEL_NULL(ai_movement_handler)
-	return ..()
-
 /mob/living/carbon/xenomorph/proc/init_movement_handler()
 	return new /datum/xeno_ai_movement(src)