From 87c706ded7d4ed8466679f865f7bcb754581698b Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Wed, 22 Jun 2022 14:58:45 -0700
Subject: [PATCH] NSEntity: Respect 'team_no' entity key in all team games to
 filter out which team can touch what

---
 src/gs-entbase/shared/NSEntity.qc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/gs-entbase/shared/NSEntity.qc b/src/gs-entbase/shared/NSEntity.qc
index 54ac14c5..9a3e459e 100644
--- a/src/gs-entbase/shared/NSEntity.qc
+++ b/src/gs-entbase/shared/NSEntity.qc
@@ -202,6 +202,14 @@ NSEntity::EndTouch(entity eToucher)
 void
 NSEntity::TouchHandler(void)
 {
+#ifdef SERVER
+	if (g_grMode.IsTeamPlay())
+	if (m_iTeam > 0)
+	if (m_iTeam != other.team) {
+		return;
+	}
+#endif
+
 	/* start touch in case we haven't */
 	if (m_beingTouched != true)
 		StartTouch(other);