From 6d3ef37f9546c2e3e3ae5df8d154367555322a72 Mon Sep 17 00:00:00 2001
From: Antonio Martinez <aj@worldsbe.st>
Date: Sun, 24 Aug 2025 18:36:16 -0400
Subject: [PATCH] Only apply instawhip extended punish if it totally whiffs

---
 src/k_collide.cpp |  6 ++----
 src/p_map.c       | 11 +++++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/k_collide.cpp b/src/k_collide.cpp
index 8f8c42586..bd688a9bc 100644
--- a/src/k_collide.cpp
+++ b/src/k_collide.cpp
@@ -1054,10 +1054,6 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
 				attackerPlayer->roundconditions.checkthisframe = true;
 			}
 
-			// Remove extended whip recovery from the attacker
-			if (attackerPlayer->defenseLockout > PUNISHWINDOW)
-				attackerPlayer->defenseLockout -= PUNISHWINDOW;
-
 			return true;
 		}
 		return false;
@@ -1104,12 +1100,14 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
 			if (K_TryPickMeUp(attacker, victim, true))
 			{
 				shield->hitlag = attacker->hitlag; // players hitlag is handled in K_TryPickMeUp, and we need to set for the shield too
+				return true;
 			}
 			else
 			{
 				P_DamageMobj(victim, shield, attacker, 1, DMG_NORMAL);
 				K_AddHitLag(attacker, attackerHitlag, false);
 				shield->hitlag = attacker->hitlag;
+				return true;
 			}
 		}
 		return false;
diff --git a/src/p_map.c b/src/p_map.c
index 69de72ee1..580f0438e 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -749,7 +749,14 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
 			return BMIT_CONTINUE; // overhead
 		if (g_tm.thing->z + g_tm.thing->height < thing->z)
 			return BMIT_CONTINUE; // underneath
-		K_InstaWhipCollide(g_tm.thing, thing);
+
+		boolean hit = K_InstaWhipCollide(g_tm.thing, thing);
+		if (hit && g_tm.thing->target && !P_MobjWasRemoved(g_tm.thing->target) && g_tm.thing->target->player)
+		{
+			player_t *attacker = g_tm.thing->target->player;
+			if (attacker->defenseLockout > PUNISHWINDOW)
+				attacker->defenseLockout -= PUNISHWINDOW;
+		}
 		return BMIT_CONTINUE;
 	}
 
@@ -4197,7 +4204,7 @@ static void P_BouncePlayerMove(mobj_t *mo, TryMoveResult_t *result)
 		if (mo->eflags & MFE_VERTICALFLIP)
 			mo->momz -= 40*mo->scale;
 		else
-			mo->momz += 40*mo->scale; 
+			mo->momz += 40*mo->scale;
 	}
 
 	mo->momx = tmxmove;