From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 28 Mar 2016 13:54:51 +0000 (+0000)
Subject: cl_collision: don't hit network entities of players who don't have a network entity... 
X-Git-Tag: xonotic-v0.8.2~47
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b49adfdc4ccbc1925160001d86a3f17ff918be02;p=xonotic%2Fdarkplaces.git

cl_collision: don't hit network entities of players who don't have a network entity (but rather a shared entity, i.e. a CSQC entity).

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12252 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=c77c4d374aeefb5df78a09450d7365c082fca8dd
---

diff --git a/cl_collision.c b/cl_collision.c
index d6637a5d..d414361c 100644
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -317,6 +317,8 @@ trace_t CL_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int
 				continue;
 
 			// don't hit players that don't exist
+			if (!cl.entities_active[i])
+				continue;
 			if (!cl.scores[i-1].name[0])
 				continue;
 
@@ -533,6 +535,8 @@ trace_t CL_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_
 				continue;
 
 			// don't hit players that don't exist
+			if (!cl.entities_active[i])
+				continue;
 			if (!cl.scores[i-1].name[0])
 				continue;
 
@@ -776,6 +780,8 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
 				continue;
 
 			// don't hit players that don't exist
+			if (!cl.entities_active[i])
+				continue;
 			if (!cl.scores[i-1].name[0])
 				continue;