Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index f00d42df275b032424f099cf76910ef941b8b03a..53a9e7aadc3ddaf97d7480e98f075de0fe3ed0ae 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -274,8 +274,9 @@ void SpawnThrownWeapon (vector org, float w)
        }
        else
        {
-               if(W_IsWeaponThrowable(self.weapon))
-                       W_ThrowNewWeapon(self, self.weapon, FALSE, org, randomvec() * 125 + '0 0 200');
+               if(WEPSET_CONTAINS_EW(self, self.weapon))
+                       if(W_IsWeaponThrowable(self.weapon))
+                               W_ThrowNewWeapon(self, self.weapon, FALSE, org, randomvec() * 125 + '0 0 200');
        }
 }