From c5d99305ef2aa79983f5e95ac6cdc13ce415b54c Mon Sep 17 00:00:00 2001
From: kraflab <kraflab@gmail.com>
Date: Fri, 23 Apr 2021 17:48:32 +0200
Subject: [PATCH] Fix P_KillMobj in mbf21

---
 prboom2/src/p_inter.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/prboom2/src/p_inter.c b/prboom2/src/p_inter.c
index 913319ca6..b43d316ac 100644
--- a/prboom2/src/p_inter.c
+++ b/prboom2/src/p_inter.c
@@ -745,8 +745,12 @@ static void P_KillMobj(mobj_t *source, mobj_t *target)
   // heretic
   target->flags2 &= ~MF2_PASSMOBJ;
 
-  if (compatibility_level == mbf_compatibility &&
-      !prboom_comp[PC_MBF_REMOVE_THINKER_IN_KILLMOBJ].state)
+  if (
+    mbf21 || (
+      compatibility_level == mbf_compatibility &&
+      !prboom_comp[PC_MBF_REMOVE_THINKER_IN_KILLMOBJ].state
+    )
+  )
   {
     // killough 8/29/98: remove from threaded list
     P_UpdateThinker(&target->thinker);