From c5985d58cbf67069b96ad3ec66fdc97d83b3e898 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Thu, 8 Feb 2024 08:03:39 -0800 Subject: [PATCH] Melee weapons: fix being given after taking all weapons --- scripts/zm/_zm_reimagined.gsc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index 44eb0b3b..f4b20f02 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -1350,16 +1350,16 @@ held_melee_weapon_world_model_fix() while (1) { - if (is_true(self.afterlife)) + melee_weapon = self get_player_melee_weapon(); + current_weapon = self getcurrentweapon(); + + if (getweaponmodel(melee_weapon) == "t6_wpn_none_world") { wait 0.05; continue; } - melee_weapon = self get_player_melee_weapon(); - current_weapon = self getcurrentweapon(); - - if (getweaponmodel(melee_weapon) == "t6_wpn_none_world") + if (!self hasweapon(melee_weapon) && !self hasweapon("held_" + melee_weapon)) { wait 0.05; continue;