]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Check if the target still exists too
authorSamual Lenks <samual@xonotic.org>
Tue, 11 Sep 2012 06:38:11 +0000 (02:38 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 11 Sep 2012 06:38:11 +0000 (02:38 -0400)
qcsrc/server/mutators/gamemode_ctf.qc

index d30dda8608a87cd3a4a9070550b30bc381866bb3..32c7e4a78fff875605254f605c1604f48db57c7c 100644 (file)
@@ -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))