From: Samual <samual@xonotic.org>
Date: Mon, 2 Apr 2012 06:48:39 +0000 (-0400)
Subject: Actually, re-think that a little bit
X-Git-Tag: xonotic-v0.7.0~240^2~101
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=648bd6e268881aaade7cbb3932eb07b0b5eb02e3;p=xonotic%2Fxonotic-data.pk3dir.git

Actually, re-think that a little bit
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 6d4dab29f..0c3ccc841 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -987,7 +987,7 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey)
 	if(time > player.throw_antispam)
 	{
 		// pass the flag to a team mate
-		if(autocvar_g_ctf_pass)
+		if(autocvar_g_ctf_pass && !player.speedrunning && !player.vehicle)
 		{
 			entity head, closest_target;
 			head = findradius(player.origin, autocvar_g_ctf_pass_radius);
@@ -996,8 +996,7 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey)
 			{
 				if(head.classname == "player" && head.deadflag == DEAD_NO)
 				if(head != player && !IsDifferentTeam(head, player))
-				if(!player.speedrunning && !head.speedrunning)
-				if(!player.vehicle && !head.vehicle)
+				if(!head.speedrunning && !head.vehicle)
 				{
 					traceline(player.origin, head.origin, MOVE_NOMONSTERS, player);
 					if not((trace_fraction < 1) && (trace_ent != head))