Fix MaxAmmo and CustomItem Weapon (#2302)

Exiled-Team · Nov 29, 2023 · 0e5842e · 0e5842e
1 parent 0c7a9cb
commit 0e5842e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Exiled.API/Features/Items/Firearm.cs b/Exiled.API/Features/Items/Firearm.cs
@@ -130,13 +130,13 @@ public byte MaxAmmo
                 switch (Base.AmmoManagerModule)
                 {
                     case TubularMagazineAmmoManager tubularMagazineAmmoManager:
-                        tubularMagazineAmmoManager.MaxAmmo = value;
+                        tubularMagazineAmmoManager.MaxAmmo = (byte)(value - Base.AttachmentsValue(AttachmentParam.MagazineCapacityModifier) - (Base.Status.Flags.HasFlagFast(FirearmStatusFlags.Cocked) ? tubularMagazineAmmoManager.ChamberedRounds : 0));
                         break;
                     case ClipLoadedInternalMagAmmoManager clipLoadedInternalMagAmmoManager:
-                        clipLoadedInternalMagAmmoManager.MaxAmmo = value;
+                        clipLoadedInternalMagAmmoManager.MaxAmmo = (byte)(value - Base.AttachmentsValue(AttachmentParam.MagazineCapacityModifier));
                         break;
                     case AutomaticAmmoManager automaticAmmoManager:
-                        automaticAmmoManager.MaxAmmo = value;
+                        automaticAmmoManager.MaxAmmo = (byte)(value - Base.AttachmentsValue(AttachmentParam.MagazineCapacityModifier) - automaticAmmoManager.ChamberedAmount);
                         break;
                     default:
                         Log.Warn($"MaxAmmo can't be used for this Item: {Type} ({Base.AmmoManagerModule})");

diff --git a/Exiled.CustomItems/API/Features/CustomWeapon.cs b/Exiled.CustomItems/API/Features/CustomWeapon.cs
@@ -9,7 +9,6 @@ namespace Exiled.CustomItems.API.Features
 {
     using System;
 
-    using Exiled.API.Enums;
     using Exiled.API.Extensions;
     using Exiled.API.Features;
     using Exiled.API.Features.DamageHandlers;
@@ -19,7 +18,6 @@ namespace Exiled.CustomItems.API.Features
 
     using InventorySystem.Items.Firearms.Attachments;
     using InventorySystem.Items.Firearms.Attachments.Components;
-    using InventorySystem.Items.Firearms.BasicMessages;
 
     using UnityEngine;
 
@@ -77,6 +75,7 @@ public override ItemType Type
                 firearm.AddAttachment(Attachments);
 
             firearm.Ammo = ClipSize;
+            firearm.MaxAmmo = ClipSize;
 
             Pickup? pickup = firearm.CreatePickup(position);
 
@@ -102,7 +101,9 @@ public override ItemType Type
             {
                 if (!Attachments.IsEmpty())
                     firearm.AddAttachment(Attachments);
+
                 byte ammo = firearm.Ammo;
+                firearm.MaxAmmo = ClipSize;
                 Log.Debug($"{nameof(Name)}.{nameof(Spawn)}: Spawning weapon with {ammo} ammo.");
                 Pickup? pickup = firearm.CreatePickup(position);
                 pickup.Scale = Scale;
@@ -126,7 +127,9 @@ public override void Give(Player player, bool displayMessage = true)
             {
                 if (!Attachments.IsEmpty())
                     firearm.AddAttachment(Attachments);
+
                 firearm.Ammo = ClipSize;
+                firearm.MaxAmmo = ClipSize;
             }
 
             Log.Debug($"{nameof(Give)}: Adding {item.Serial} to tracker.");