From: Mario <zacjardine@y7mail.com>
Date: Sat, 8 Sep 2018 10:04:46 +0000 (+1000)
Subject: Apply player clip collision to observers
X-Git-Tag: xonotic-v0.8.5~1895
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0e8f8d96ca9e841c043ac3fad3583bed4600e4d1;p=xonotic%2Fxonotic-data.pk3dir.git

Apply player clip collision to observers
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 8e6a26961..2418500ef 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -332,7 +332,10 @@ void PutObserverInServer(entity this)
 	this.strength_finished = 0;
 	this.invincible_finished = 0;
 	this.superweapons_finished = 0;
-	this.dphitcontentsmask = 0;
+	//this.dphitcontentsmask = 0;
+	this.dphitcontentsmask = DPCONTENTS_SOLID;
+	if (autocvar_g_playerclip_collisions)
+		this.dphitcontentsmask |= DPCONTENTS_PLAYERCLIP;
 	this.pushltime = 0;
 	this.istypefrag = 0;
 	setthink(this, func_null);