From 3bdfa3b9f41b17f77337c5a35a8b747f2d513560 Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Sat, 12 Nov 2022 14:59:31 -0600
Subject: [PATCH] Remove mobj interpolator only after thinker

---
 src/p_mobj.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 9bb68b1e8..4caf730f1 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -11178,8 +11178,6 @@ void P_RemoveMobj(mobj_t *mobj)
 	memset((UINT8 *)mobj + sizeof(thinker_t), 0xff, sizeof(mobj_t) - sizeof(thinker_t));
 #endif
 
-	R_RemoveMobjInterpolator(mobj);
-
 	// free block
 	if (!mobj->thinker.next)
 	{ // Uh-oh, the mobj doesn't think, P_RemoveThinker would never go through!
@@ -11196,6 +11194,8 @@ void P_RemoveMobj(mobj_t *mobj)
 	}
 
 	P_RemoveThinker((thinker_t *)mobj);
+
+	R_RemoveMobjInterpolator(mobj);
 }
 
 // This does not need to be added to Lua.