From: Mario <zacjardine@y7mail.com>
Date: Tue, 1 Dec 2020 13:29:03 +0000 (+1000)
Subject: Add a fix for #1824: Don't attempt to network EntCS data as tempentities initially... 
X-Git-Tag: xonotic-v0.8.5~649^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0d209ad5fc266e87a85280d7ec2e8737a3834643;p=xonotic%2Fxonotic-data.pk3dir.git

Add a fix for #1824: Don't attempt to network EntCS data as tempentities initially, leaving the networking of linked entities for the engine to handle
---

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index 9b96feb3b..7d8442140 100644
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -221,11 +221,14 @@ ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
 		setthink(e, entcs_think);
 		e.nextthink = time;
 		Net_LinkEntity(e, false, 0, entcs_send);
+		// NOTE: the following code block has been disabled as a workaround for https://gitlab.com/xonotic/xonotic-data.pk3dir/-/issues/1824
+#if 0
 		if (!IS_REAL_CLIENT(player)) return;
 		FOREACH_CLIENT(true, {
 			assert(CS(it).entcs);
 			_entcs_send(CS(it).entcs, msg_entity = player, BITS(23), MSG_ONE);
 		});
+#endif
 	}
 
 	void entcs_detach(entity player)