X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weapons.qc;h=b28b9030e5f456d737b884554a5a68adeac81709;hb=3bd825ec4ff3c071ccefb2b4424339b3b4b49315;hp=41cdd2b05e289edff14ebd35f20fa8700056d287;hpb=26f37b6d480a3a276af0ab52ac340dd110186704;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 41cdd2b05..b28b9030e 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -350,15 +350,15 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce)
 	Send_Notification(NOTIF_ONE, self, MSG_MULTI, ITEM_WEAPON_DROP, a, w);
 }
 
-float forbidWeaponUse()
+float forbidWeaponUse(entity player)
 {
 	if(time < game_starttime && !autocvar_sv_ready_restart_after_countdown)
 		return 1;
 	if(round_handler_IsActive() && !round_handler_IsRoundStarted())
 		return 1;
-	if(self.player_blocked)
+	if(player.player_blocked)
 		return 1;
-	if(self.frozen)
+	if(player.frozen)
 		return 1;
 	return 0;
 }
@@ -373,7 +373,7 @@ void W_WeaponFrame()
 	if (!self.weaponentity || self.health < 1)
 		return; // Dead player can't use weapons and injure impulse commands
 
-	if(forbidWeaponUse())
+	if(forbidWeaponUse(self))
 	if(self.weaponentity.state != WS_CLEAR)
 	{
 		w_ready();