From bcc6131f2eeee9de7088cb7c3aeb17c68c15df45 Mon Sep 17 00:00:00 2001 From: cypress Date: Sat, 4 Nov 2023 09:37:53 -0400 Subject: [PATCH] SERVER: Fix actions being looped while holding Flamethrower --- source/server/weapons/weapon_core.qc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/server/weapons/weapon_core.qc b/source/server/weapons/weapon_core.qc index d0aa40b..3e5d6a2 100644 --- a/source/server/weapons/weapon_core.qc +++ b/source/server/weapons/weapon_core.qc @@ -1939,7 +1939,7 @@ void() CheckPlayer = void () Weapon_Logic = { // HACK HACK: Don't let the frame updater take control of hold fire. - if (self.weaponframe == GetFrame(self.weapon, FIRE_HOLD) && GetFrame(self.weapon, FIRE_HOLD) != 0 && !self.isBuying) { + if (self.weaponframe == GetFrame(self.weapon, FIRE_HOLD) && GetFrame(self.weapon, FIRE_HOLD) != 0 && self.weaponmodel == GetWeaponModel(self.weapon, 0)) { } else { W_Frame_Update(); @@ -2059,7 +2059,7 @@ void () Weapon_Logic = // Hold fire weapons should get set back to base frame. if (GetFrame(self.weapon, FIRE_HOLD) != 0 && self.weaponframe == GetFrame(self.weapon, FIRE_HOLD) && - !self.isBuying) { + self.weaponmodel == GetWeaponModel(self.weapon, 0)) { self.weaponframe = 0; }