From e6fa7394afd0735a765a6ef21197b839a039a96f Mon Sep 17 00:00:00 2001 From: IS4 Date: Sat, 1 Jan 2022 20:24:36 +0100 Subject: [PATCH 1/2] Change InfiniteAmmo only if WPUnlimitedAmmo is allowed --- vMenu/FunctionsController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vMenu/FunctionsController.cs b/vMenu/FunctionsController.cs index 425f160c..a28741ff 100644 --- a/vMenu/FunctionsController.cs +++ b/vMenu/FunctionsController.cs @@ -1382,9 +1382,9 @@ private async Task WeaponOptions() } // Enable/disable infinite ammo. - if (Game.PlayerPed.Weapons.Current != null && Game.PlayerPed.Weapons.Current.Hash != WeaponHash.Unarmed) + if (Game.PlayerPed.Weapons.Current != null && Game.PlayerPed.Weapons.Current.Hash != WeaponHash.Unarmed && IsAllowed(Permission.WPUnlimitedAmmo)) { - Game.PlayerPed.Weapons.Current.InfiniteAmmo = MainMenu.WeaponOptionsMenu.UnlimitedAmmo && IsAllowed(Permission.WPUnlimitedAmmo); + Game.PlayerPed.Weapons.Current.InfiniteAmmo = MainMenu.WeaponOptionsMenu.UnlimitedAmmo; } if (MainMenu.WeaponOptionsMenu.AutoEquipChute) From ba29907aeaf68f1c7acb30168cc41e63fc7b70ce Mon Sep 17 00:00:00 2001 From: IS4 Date: Thu, 10 Feb 2022 02:17:01 +0100 Subject: [PATCH 2/2] Update vMenu/FunctionsController.cs Co-authored-by: Christopher M. <10535902+cm8263@users.noreply.github.com> --- vMenu/FunctionsController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vMenu/FunctionsController.cs b/vMenu/FunctionsController.cs index a28741ff..c9839d4e 100644 --- a/vMenu/FunctionsController.cs +++ b/vMenu/FunctionsController.cs @@ -1382,7 +1382,7 @@ private async Task WeaponOptions() } // Enable/disable infinite ammo. - if (Game.PlayerPed.Weapons.Current != null && Game.PlayerPed.Weapons.Current.Hash != WeaponHash.Unarmed && IsAllowed(Permission.WPUnlimitedAmmo)) + if (IsAllowed(Permission.WPUnlimitedAmmo) && Game.PlayerPed.Weapons.Current != null && Game.PlayerPed.Weapons.Current.Hash != WeaponHash.Unarmed) { Game.PlayerPed.Weapons.Current.InfiniteAmmo = MainMenu.WeaponOptionsMenu.UnlimitedAmmo; }