Skip to content

fix: Potential Error Fix With Custom Weapon Reloading #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
louis1706 merged 2 commits into from
Feb 2, 2025
Merged

fix: Potential Error Fix With Custom Weapon Reloading #421

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5a3766
fix potential dictionary error
TtroubleTT Jan 30, 2025
8f0d3ae
apply suggestion
TtroubleTT Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion EXILED/Exiled.CustomItems/API/Features/CustomWeapon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Comment thread
TtroubleTT marked this conversation as resolved.
Outdated
if (ammoToGive < ammoInInventory)
{
ev.Firearm.MagazineAmmo = ammoToGive;
Expand Down