@@ -17,7 +17,6 @@ namespace Exiled.CustomItems.API.Features
17
17
using Exiled . API . Features . Items ;
18
18
using Exiled . API . Features . Pickups ;
19
19
using Exiled . Events . EventArgs . Player ;
20
- using InventorySystem ;
21
20
using InventorySystem . Items . Firearms . Attachments ;
22
21
using InventorySystem . Items . Firearms . Attachments . Components ;
23
22
using InventorySystem . Items . Firearms . Modules ;
@@ -214,7 +213,7 @@ private void OnInternalReloading(ReloadingWeaponEventArgs ev)
214
213
if ( ! Check ( ev . Player . CurrentItem ) )
215
214
return ;
216
215
217
- if ( ClipSize > 0 && ev . Firearm . Base . GetTotalStoredAmmo ( ) >= ClipSize )
216
+ if ( ClipSize > 0 && ev . Firearm . TotalAmmo >= ClipSize )
218
217
{
219
218
ev . IsAllowed = false ;
220
219
return ;
@@ -230,7 +229,7 @@ private void OnInternalReloaded(ReloadedWeaponEventArgs ev)
230
229
231
230
if ( ClipSize > 0 )
232
231
{
233
- int ammoChambered = ( ( AutomaticActionModule ) ev . Firearm . Base . Modules . FirstOrDefault ( x => x is AutomaticActionModule ) ) ? . SyncAmmoChambered ?? 0 ;
232
+ int ammoChambered = ( ( AutomaticActionModule ? ) ev . Firearm . Base . Modules . FirstOrDefault ( x => x is AutomaticActionModule ) ) ? . SyncAmmoChambered ?? 0 ;
234
233
int ammoToGive = ClipSize - ammoChambered ;
235
234
236
235
AmmoType ammoType = ev . Firearm . AmmoType ;
@@ -241,13 +240,13 @@ private void OnInternalReloaded(ReloadedWeaponEventArgs ev)
241
240
if ( ammoToGive < ammoInInventory )
242
241
{
243
242
ev . Firearm . MagazineAmmo = ammoToGive ;
244
- int newAmmo = ev . Player . Inventory . GetCurAmmo ( ammoType . GetItemType ( ) ) + ammoDrop ;
245
- ev . Player . Inventory . ServerSetAmmo ( ammoType . GetItemType ( ) , newAmmo ) ;
243
+ int newAmmo = ev . Player . GetAmmo ( ammoType ) + ammoDrop ;
244
+ ev . Player . SetAmmo ( ammoType , ( ushort ) newAmmo ) ;
246
245
}
247
246
else
248
247
{
249
248
ev . Firearm . MagazineAmmo = ammoInInventory ;
250
- ev . Player . Inventory . ServerSetAmmo ( ammoType . GetItemType ( ) , 0 ) ;
249
+ ev . Player . SetAmmo ( ammoType , 0 ) ;
251
250
}
252
251
}
253
252
0 commit comments