From c5a37669b22ae96ef16e9ea65a7403f82c3493a4 Mon Sep 17 00:00:00 2001 From: TtroubleTT Date: Thu, 30 Jan 2025 11:47:20 -0800 Subject: [PATCH 1/2] fix potential dictionary error --- EXILED/Exiled.CustomItems/API/Features/CustomWeapon.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/EXILED/Exiled.CustomItems/API/Features/CustomWeapon.cs b/EXILED/Exiled.CustomItems/API/Features/CustomWeapon.cs index 0eb927dc3e..99e699bfd4 100644 --- a/EXILED/Exiled.CustomItems/API/Features/CustomWeapon.cs +++ b/EXILED/Exiled.CustomItems/API/Features/CustomWeapon.cs @@ -237,7 +237,13 @@ private void OnInternalReloaded(ReloadedWeaponEventArgs ev) int firearmAmmo = ev.Firearm.MagazineAmmo; int ammoDrop = -(ClipSize - firearmAmmo - ammoChambered); - int ammoInInventory = ev.Player.Ammo[ammoType.GetItemType()] + firearmAmmo; + ushort playerAmmo = 0; + if (ev.Player.Ammo.TryGetValue(ammoType.GetItemType(), out ushort ammo)) + { + playerAmmo = ammo; + } + + int ammoInInventory = playerAmmo + firearmAmmo; if (ammoToGive < ammoInInventory) { ev.Firearm.MagazineAmmo = ammoToGive; From 8f0d3aee3893f19c6cb7143bb39267fd228084bd Mon Sep 17 00:00:00 2001 From: TtroubleTT <121741230+TtroubleTT@users.noreply.github.com> Date: Thu, 30 Jan 2025 12:04:19 -0800 Subject: [PATCH 2/2] apply suggestion Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com> --- EXILED/Exiled.CustomItems/API/Features/CustomWeapon.cs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/EXILED/Exiled.CustomItems/API/Features/CustomWeapon.cs b/EXILED/Exiled.CustomItems/API/Features/CustomWeapon.cs index 99e699bfd4..6e8cf58e29 100644 --- a/EXILED/Exiled.CustomItems/API/Features/CustomWeapon.cs +++ b/EXILED/Exiled.CustomItems/API/Features/CustomWeapon.cs @@ -237,13 +237,7 @@ private void OnInternalReloaded(ReloadedWeaponEventArgs ev) int firearmAmmo = ev.Firearm.MagazineAmmo; int ammoDrop = -(ClipSize - firearmAmmo - ammoChambered); - ushort playerAmmo = 0; - if (ev.Player.Ammo.TryGetValue(ammoType.GetItemType(), out ushort ammo)) - { - playerAmmo = ammo; - } - - int ammoInInventory = playerAmmo + firearmAmmo; + int ammoInInventory = ev.Player.GetAmmo(ammoType) + firearmAmmo; if (ammoToGive < ammoInInventory) { ev.Firearm.MagazineAmmo = ammoToGive;