From 83fdcd00c0c4c6dbd65e2b663123f57757d4ae90 Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Sat, 11 Apr 2026 12:28:14 -0400
Subject: [PATCH] Fix Lua being able to crash the game by removing an Mobj with
 MobjSpawn

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

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 6916c4069..2b4d4c849 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -14013,6 +14013,10 @@ static mobj_t *P_SpawnMobjFromMapThing(mapthing_t *mthing, fixed_t x, fixed_t y,
 	size_t arg = SIZE_MAX;
 
 	mobj = P_SpawnMobj(x, y, z, i);
+
+	if (mobj == NULL || P_MobjWasRemoved(mobj))
+		return NULL;
+
 	mobj->spawnpoint = mthing;
 
 	if (doangle)