From: Mario <mario@smbclan.net>
Date: Sat, 18 Jun 2016 15:15:54 +0000 (+1000)
Subject: Only hide the flag from the player if the player can carry the flag into the vehicle
X-Git-Tag: xonotic-v0.8.2~796
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=682da4b29f1a896e13e247acaaee47903b95a3a7;p=xonotic%2Fxonotic-data.pk3dir.git

Only hide the flag from the player if the player can carry the flag into the vehicle
---

diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qc b/qcsrc/server/mutators/mutator/gamemode_ctf.qc
index f9872e749..a184e68df 100644
--- a/qcsrc/server/mutators/mutator/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_ctf.qc
@@ -2238,14 +2238,13 @@ MUTATOR_HOOKFUNCTION(ctf, VehicleEnter)
 
 	if(player.flagcarried)
 	{
-		player.flagcarried.nodrawtoclient = player; // hide the flag from the driver
-
 		if(!autocvar_g_ctf_allow_vehicle_carry && !autocvar_g_ctf_allow_vehicle_touch)
 		{
 			ctf_Handle_Throw(player, NULL, DROP_NORMAL);
 		}
 		else
 		{
+			player.flagcarried.nodrawtoclient = player; // hide the flag from the driver
 			setattachment(player.flagcarried, veh, "");
 			setorigin(player.flagcarried, VEHICLE_FLAG_OFFSET);
 			player.flagcarried.scale = VEHICLE_FLAG_SCALE;