From f1296f5b79150dee1992cefa19c286851451df2d Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 5 Feb 2018 22:43:08 +1000 Subject: [PATCH] Call w_ready on weapon entity if its state isn't clear and switchweapon is null, fixes offhand hook getting player stuck in firing animation --- qcsrc/server/weapons/weaponsystem.qc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index 2f6fcb68d..c7e365614 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -472,6 +472,8 @@ void W_WeaponFrame(Player actor, .entity weaponentity) if (this.m_switchweapon == WEP_Null) { + if (this.state != WS_CLEAR) + w_ready(this.m_weapon, actor, weaponentity, button_atck | (button_atck2 << 1)); this.m_weapon = WEP_Null; this.m_switchingweapon = WEP_Null; this.state = WS_CLEAR; -- 2.39.2