From: Martin Taibr <taibr.martin@gmail.com>
Date: Fri, 16 Sep 2016 00:40:30 +0000 (+0200)
Subject: fix nades colliding with the player himself (unless g_nades_nade_small is 1)
X-Git-Tag: xonotic-v0.8.2~565^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F367%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

fix nades colliding with the player himself (unless g_nades_nade_small is 1)
---

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index c4e73d286..02760045c 100644
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -911,7 +911,7 @@ void toss_nade(entity e, bool set_owner, vector _velocity, float _time)
 		setsize(_nade, '-16 -16 -16', '16 16 16');
 	set_movetype(_nade, MOVETYPE_BOUNCE);
 
-	tracebox(_nade.origin, _nade.mins, _nade.maxs, _nade.origin, false, _nade);
+	tracebox(_nade.origin, _nade.mins, _nade.maxs, _nade.origin, MOVE_NOMONSTERS, _nade);
 	if (trace_startsolid)
 		setorigin(_nade, e.origin);