From: Mario <zacjardine@y7mail.com>
Date: Thu, 13 Nov 2014 15:34:11 +0000 (+1100)
Subject: Do a trace before teleporting player, to make sure we're not putting them into a... 
X-Git-Tag: xonotic-v0.8.0~162^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d779045d9870f43fa814ab02c2b91d7eaed57fa7;p=xonotic%2Fxonotic-data.pk3dir.git

Do a trace before teleporting player, to make sure we're not putting them into a wall
---

diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
index 13344bd20..bd858796a 100644
--- a/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@ -342,6 +342,8 @@ void nade_translocate_boom()
 		return;
 
 	vector locout = self.origin + '0 0 1' * (1 - self.realowner.mins_z - 24);
+	tracebox(locout, self.realowner.mins, self.realowner.maxs, locout, MOVE_NOMONSTERS, self.realowner);
+	locout = trace_endpos
 
 	makevectors(self.realowner.angles);