Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load

[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 077d839a5fe6bfee654832b687917992a6f44cf6..ace69efbec371611a95e109a4e4fe90002468253 100644 (file)
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -284,6 +284,8 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce)
        w = self.weapon;
        if (w == 0)
                return; // just in case
+       if(self.weapon_forbidchange)
+               return;
        if(MUTATOR_CALLHOOK(ForbidThrowCurrentWeapon))
                return;
        if(!autocvar_g_weapon_throwable)