From 09a5771ad46bf6fd600c264b3c22e75d7ad9150a Mon Sep 17 00:00:00 2001 From: Major Cooke Date: Sun, 29 Mar 2020 10:41:13 -0500 Subject: [PATCH] - Fixed: SPECTRAL flag didn't check for DMG_FORCED before aborting DamageMobj. --- src/playsim/p_interaction.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/playsim/p_interaction.cpp b/src/playsim/p_interaction.cpp index d892e675d..f6dadb210 100644 --- a/src/playsim/p_interaction.cpp +++ b/src/playsim/p_interaction.cpp @@ -1031,8 +1031,8 @@ static int DamageMobj (AActor *target, AActor *inflictor, AActor *source, int da } FName MeansOfDeath = mod; - // Spectral targets only take damage from spectral projectiles. - if (target->flags4 & MF4_SPECTRAL && !telefragDamage) + // Spectral targets only take damage from spectral projectiles unless forced or telefragging. + if ((target->flags4 & MF4_SPECTRAL) && !(flags & DMG_FORCED) && !telefragDamage) { if (inflictor == NULL || !(inflictor->flags4 & MF4_SPECTRAL)) {