Merge branch 'master' into martin-t/echo

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

diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index af148393255aea59b5ab3902b165ed98b3d4f3a3..7e8a061f049b1ebc552308c796219c1b716eedbd 100644 (file)
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -134,9 +134,9 @@ bool W_IsWeaponThrowable(entity this, int w)
        if (!autocvar_g_pickup_items)
                return false;
        if (g_weaponarena)
-               return 0;
-    if(w == WEP_Null.m_id)
-        return false;
+               return false;
+       if (w == WEP_Null.m_id)
+               return false;
 
        return (Weapons_from(w)).weaponthrowable;
 }