From 774eb4cf149ac0a834e63e91b0495bdd57b2d355 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Fri, 7 Aug 2020 09:58:52 +0200
Subject: [PATCH] trigger_once: Implement the spawnflags that check for whether
 a monster/client is allowed to trigger.

---
 src/gs-entbase/server/trigger_once.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gs-entbase/server/trigger_once.cpp b/src/gs-entbase/server/trigger_once.cpp
index 88e2b1d5..5a6c6a65 100644
--- a/src/gs-entbase/server/trigger_once.cpp
+++ b/src/gs-entbase/server/trigger_once.cpp
@@ -45,14 +45,19 @@ class trigger_once:CBaseTrigger
 void
 trigger_once::touch(void)
 {
+	if (!(spawnflags & TO_MONSTERS) && other.spawnflags & FL_MONSTER)
+		return;
+	if (spawnflags & TO_NOCLIENTS && other.spawnflags & FL_CLIENT)
+		return;
+
 	eActivator = other;
+	solid = SOLID_NOT; /* make inactive */
 
 	if (m_flDelay > 0) {
 		CBaseTrigger::UseTargets_Delay(m_flDelay);
 	} else {
 		CBaseTrigger::UseTargets();
 	}
-	solid = SOLID_NOT;
 }
 
 void