From 557b8fe105218eb0a13db3cabf1ed8c301fc4a78 Mon Sep 17 00:00:00 2001
From: GenZmeY <genzmey@gmail.com>
Date: Tue, 13 Oct 2020 12:02:10 +0300
Subject: [PATCH] fix: calculating the extra ammo for the "Ammo regeneration"
 trait

Use MaxAmmo instead of SpareAmmo for the "Ammo regeneration" trait
when calculating additional ammo.
---
 ServerExt/Classes/Ext_T_AmmoRegHelp.uc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ServerExt/Classes/Ext_T_AmmoRegHelp.uc b/ServerExt/Classes/Ext_T_AmmoRegHelp.uc
index 56e1a9d..31ef5a9 100644
--- a/ServerExt/Classes/Ext_T_AmmoRegHelp.uc
+++ b/ServerExt/Classes/Ext_T_AmmoRegHelp.uc
@@ -27,7 +27,7 @@ function Timer()
 			{
 				if( W.SpareAmmoCount[i] < W.SpareAmmoCapacity[i] )
 				{
-					ExtraAmmo = Min(FMax(float(W.SpareAmmoCapacity[i])*RegCount,1.f),W.SpareAmmoCapacity[i]);
+					ExtraAmmo = FMax(float(W.SpareAmmoCapacity[i] + W.MagazineCapacity[i])*RegCount,1.f);
 					if ( i==0 )
 					{
 						W.AddAmmo(ExtraAmmo);