From f56504e0d405f2662bd496d272b13399292c853e Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Wed, 3 May 2023 09:37:48 -0400
Subject: [PATCH] ACS: Prevent spectators from using sector actions

---
 src/p_spec.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/p_spec.c b/src/p_spec.c
index 6ff65a00a..953bf73a8 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -5920,11 +5920,28 @@ void P_CheckMobjTouchingSectorActions(mobj_t *mobj, boolean continuous)
 {
 	sector_t *originalsector;
 
-	if (!mobj->subsector)
+	if (mobj->subsector == NULL)
+	{
 		return;
+	}
 
 	originalsector = mobj->subsector->sector;
 
+	if (mobj->player != NULL)
+	{
+		if (mobj->player->spectator == true)
+		{
+			// Ignore spectators.
+			return;
+		}
+
+		if (mobj->player->pflags & PF_NOCONTEST)
+		{
+			// Ignore NO CONTEST.
+			return;
+		}
+	}
+
 	P_CheckMobj3DFloorAction(mobj, originalsector, continuous);
 	if TELEPORTED(mobj)	return;