Merge branch 'master' into Mario/overkill

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

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 2885e6dc51b7412570bd14b06aea394a43eca1ab..91559de957b3ff81a9d43d4cc0f84e0f9da08a6e 100644 (file)
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -358,6 +358,8 @@ float forbidWeaponUse()
                return 1;
        if(self.player_blocked)
                return 1;
+       if(self.weapon_blocked)
+               return 1;
        if(self.freezetag_frozen)
                return 1;
        return 0;