From cbc895a3a7c40bfa0c0630c2671a0339d1c28921 Mon Sep 17 00:00:00 2001
From: GenericHeroGuy <genericheroguy@noreply.codeberg.org>
Date: Mon, 15 Dec 2025 15:53:34 +0100
Subject: [PATCH] Fix crashes if mobj is removed in special trigger code (by
 Indev)

---
 src/p_spec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/p_spec.c b/src/p_spec.c
index e2e0b5e2b..0b53f4689 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -5546,7 +5546,7 @@ sector_t *P_ThingOnSpecial3DFloor(mobj_t *mo)
 	return NULL;
 }
 
-#define TELEPORTED(mo) (mo->subsector->sector != originalsector)
+#define TELEPORTED(mo) (P_MobjWasRemoved(mo) || mo->subsector->sector != originalsector)
 
 /** Checks if a player is standing on or is inside a 3D floor (e.g. water) and
   * applies any specials.