Merge branch 'master' into martin-t/okc

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / overkill / sv_overkill.qc

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 6a7e4b266e97b6cd318ab18f8d3ae8b9f9649423..d2a7308dedf04267af31ea7b599a4abd447ca08f 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -120,10 +120,9 @@ MUTATOR_HOOKFUNCTION(ok, PlayerPreThink)
        if(IS_DEAD(player) || !IS_PLAYER(player) || STAT(FROZEN, player))
                return;
 
-       if(PHYS_INPUT_BUTTON_ATCK2(player))
+       if(PHYS_INPUT_BUTTON_ATCK2(player) && time >= player.jump_interval)
        if( !forbidWeaponUse(player)
                || (round_handler_IsActive() && !round_handler_IsRoundStarted()) )
-       if(time >= player.jump_interval)
        {
                player.jump_interval = time + WEP_CVAR_PRI(blaster, refire) * W_WeaponRateFactor(player);
                makevectors(player.v_angle);