X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_ctf.qc;h=a184e68df9bb4e1398bca4555968305a846373fc;hb=682da4b29f1a896e13e247acaaee47903b95a3a7;hp=f9872e7490ed45b665b718490ee42f63dbaa7a07;hpb=1c2f612a72ce74cd13aeb879d0c4ed62a93797e6;p=xonotic%2Fxonotic-data.pk3dir.git 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;