From: Samual Lenks <samual@xonotic.org>
Date: Tue, 11 Sep 2012 06:38:11 +0000 (-0400)
Subject: Check if the target still exists too
X-Git-Tag: xonotic-v0.7.0~236
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79c66eb8c1b14db0c3cccf4cba25817f88e9c157;p=xonotic%2Fxonotic-data.pk3dir.git

Check if the target still exists too
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index d30dda860..32c7e4a78 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -716,7 +716,8 @@ void ctf_FlagThink()
 
 			print(strcat("self: ", vtos(self.origin), ", old: ", vtos(old_targ_origin), " (", ftos(vlen(self.origin - old_targ_origin)), "qu)"), ", transformed: ", vtos(targ_origin), " (", ftos(vlen(self.origin - targ_origin)), "qu)", ".\n");
 			
-			if((self.pass_target.deadflag != DEAD_NO)
+			if((self.pass_target == world)
+				|| (self.pass_target.deadflag != DEAD_NO)
 				|| (vlen(self.origin - targ_origin) > autocvar_g_ctf_pass_radius)
 				|| ((trace_fraction < 1) && (trace_ent != self.pass_target))
 				|| (time > self.ctf_droptime + autocvar_g_ctf_pass_timelimit))