From b8a503f56a66215ad6da5007dc0fd6f29a841389 Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 6 Mar 2023 23:37:41 -0800 Subject: [PATCH] Always sync health to bumpers in P_KillPlayer Fixes Death Pit respawning in Battle. --- src/p_inter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index 7204741e2..ff4b9f916 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1934,13 +1934,12 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source, return false; } - K_DestroyBumpers(player, 1); - switch (type) { case DMG_DEATHPIT: // Respawn kill types K_DoIngameRespawn(player); + player->mo->health -= K_DestroyBumpers(player, 1); return false; case DMG_SPECTATOR: // disappearifies, but still gotta put items back in play @@ -1997,10 +1996,11 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source, P_SetTarget(&boom->target, player->mo); } - K_DestroyBumpers(player, player->bumpers); player->pflags |= PF_ELIMINATED; } + K_DestroyBumpers(player, player->bumpers); + return true; }