From ce4a8e76b0d7647c213e2c6a4de92feebcfefa14 Mon Sep 17 00:00:00 2001
From: Boondorl <boondorl@live.com>
Date: Fri, 8 Nov 2024 21:58:45 -0500
Subject: [PATCH] Discs no longer blast players with collision disabled

---
 src/playsim/p_map.cpp                             | 9 ++++++++-
 wadsrc/static/zscript/actors/actor.zs             | 1 +
 wadsrc/static/zscript/actors/hexen/blastradius.zs | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/playsim/p_map.cpp b/src/playsim/p_map.cpp
index 58920499306..0f40a09370b 100644
--- a/src/playsim/p_map.cpp
+++ b/src/playsim/p_map.cpp
@@ -121,13 +121,20 @@ TArray<spechit_t> portalhit;
 //
 //==========================================================================
 
-bool P_ShouldPassThroughPlayer(AActor *self, AActor *other)
+static int P_ShouldPassThroughPlayer(AActor *self, AActor *other)
 {
   return (dmflags3 & DF3_NO_PLAYER_CLIP) &&
           other->player && other->player->mo == other &&
           self->IsFriend(other);
 }
 
+DEFINE_ACTION_FUNCTION_NATIVE(AActor, ShouldPassThroughPlayer, P_ShouldPassThroughPlayer)
+{
+	PARAM_SELF_PROLOGUE(AActor);
+	PARAM_OBJECT_NOT_NULL(other, AActor);
+	ACTION_RETURN_BOOL(P_ShouldPassThroughPlayer(self, other));
+}
+
 //==========================================================================
 //
 // CanCollideWith
diff --git a/wadsrc/static/zscript/actors/actor.zs b/wadsrc/static/zscript/actors/actor.zs
index 970b234053b..37b36e9e7c7 100644
--- a/wadsrc/static/zscript/actors/actor.zs
+++ b/wadsrc/static/zscript/actors/actor.zs
@@ -844,6 +844,7 @@ class Actor : Thinker native
 	native void Thrust(double speed = 1e37, double angle = 1e37);
 	native clearscope bool isFriend(Actor other) const;
 	native clearscope bool isHostile(Actor other) const;
+	native clearscope bool ShouldPassThroughPlayer(Actor other) const;
 	native void AdjustFloorClip();
 	native clearscope DropItem GetDropItems() const;
 	native void CopyFriendliness (Actor other, bool changeTarget, bool resetHealth = true);
diff --git a/wadsrc/static/zscript/actors/hexen/blastradius.zs b/wadsrc/static/zscript/actors/hexen/blastradius.zs
index 271f2bcfc6d..b66ca1418aa 100644
--- a/wadsrc/static/zscript/actors/hexen/blastradius.zs
+++ b/wadsrc/static/zscript/actors/hexen/blastradius.zs
@@ -139,6 +139,11 @@ extend class Actor
 			{	// Must be monster, player, missile, touchy or vulnerable
 				continue;
 			}
+			if (player && ShouldPassThroughPlayer(mo))
+			{
+				// Don't blast friendly players if collision is disabled.
+				continue;
+			}
 			if (Distance2D(mo) > radius)
 			{ // Out of range
 				continue;