From 0cd260eed177c0943ed5145d2204173fc969d76a Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Wed, 1 Mar 2023 07:25:54 -0800
Subject: [PATCH] Don't let death type damage kill respawning player

This includes death pits and instakill sectors. Does not
affect direct P_KillMobj calls.
---
 src/p_inter.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/p_inter.c b/src/p_inter.c
index 6e053a405..09f6349d6 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1911,6 +1911,12 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
 {
 	(void)source;
 
+	if (player->respawn.state != RESPAWNST_NONE)
+	{
+		K_DoInstashield(player);
+		return false;
+	}
+
 	if (!player->exiting && specialstageinfo.valid == true)
 	{
 		player->pflags |= PF_NOCONTEST;