Merge branch 'master' into Mario/overkill

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / weaponsystem.qc

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index b36a67bfe699bdd81a4e5904670596bf3b21d66c..826bb2a5a7f8415ce2f41487d17ec2da56552a89 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -421,7 +421,6 @@ bool forbidWeaponUse(entity player)
        if (player.player_blocked) return true;
        if (game_stopped) return true;
        if (STAT(FROZEN, player)) return true;
-       if (player.weapon_blocked) return true;
        if (MUTATOR_CALLHOOK(ForbidWeaponUse, player)) return true;
        return false;
 }