From ad412c9700cb19dec4ad795857796f8bb5900ec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= <gustaf@hanicef.me>
Date: Tue, 18 Apr 2023 22:08:26 +0200
Subject: [PATCH] Fix segfault when damaging mobj with no painstate

---
 src/p_inter.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/p_inter.c b/src/p_inter.c
index 8bc5c95e42..fc193ac947 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -3763,6 +3763,9 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 	else
 		P_SetMobjState(target, target->info->painstate);
 
+	if (P_MobjWasRemoved(target))
+		return false;
+
 	if (target->type == MT_HIVEELEMENTAL)
 		target->extravalue1 += 3;
 
-- 
GitLab