From 29e0e82f48a2731d01e145e310646739612385fb Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Sun, 9 May 2021 10:03:10 +0200
Subject: [PATCH] Server: Don't network RM_TRIGGER ents unless the developer
 cvar is 1.

---
 src/gs-entbase/shared/baseentity.h  |  1 -
 src/gs-entbase/shared/baseentity.qc | 21 ++++++---------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/gs-entbase/shared/baseentity.h b/src/gs-entbase/shared/baseentity.h
index 2eca379c..10eb9c90 100644
--- a/src/gs-entbase/shared/baseentity.h
+++ b/src/gs-entbase/shared/baseentity.h
@@ -35,7 +35,6 @@ class CBaseEntity
 	virtual void(float flChanged) ReceiveEntity;
 	virtual float(void) predraw;
 	virtual void(void) postdraw;
-	virtual void(void) customphysics;
 #endif
 
 #ifdef SERVER
diff --git a/src/gs-entbase/shared/baseentity.qc b/src/gs-entbase/shared/baseentity.qc
index c7abfe03..cd21b951 100644
--- a/src/gs-entbase/shared/baseentity.qc
+++ b/src/gs-entbase/shared/baseentity.qc
@@ -335,21 +335,6 @@ CBaseEntity::postdraw(void)
 {
 }
 
-void
-CBaseEntity::customphysics(void)
-{
-	if (movetype == MOVETYPE_PUSH)
-		setorigin(this, origin + (velocity * clframetime));
-
-	/* support for think/nextthink */
-	if (think && nextthink > 0.0f) {
-		if (nextthink < time) {
-			nextthink = 0.0f;
-			think();
-		}
-	}
-}
-
 void
 CBaseEntity::Init(void)
 {
@@ -434,10 +419,16 @@ CBaseEntity::SendEntity(entity ePEnt, float fChanged)
 			fChanged &= ~BASEFL_CHANGED_SOLID;
 		if (movetype == MOVETYPE_NONE)
 			fChanged &= ~BASEFL_CHANGED_MOVETYPE;
+#ifdef GS_RENDERFX
 		if (m_iRenderMode == RM_NORMAL)
 			fChanged &= ~BASEFL_CHANGED_RENDERMODE;
+#endif
 	}
 
+	/* don't network triggers unless provoked */
+	if (cvar("developer") == 0 && m_iRenderMode == RM_TRIGGER)
+		return FALSE;
+
 #ifdef GS_RENDERFX
 	/* let's not waste networking power on certain render-modes where they would
 	 * not apply anyway. this seems sensible enough. */