Discs no longer blast players with collision disabled

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

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);

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;