]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
fix BankClientComponent never updating (#33123)
authorMilon <milonpl.git@proton.me>
Thu, 30 Jan 2025 16:49:03 +0000 (17:49 +0100)
committerGitHub <noreply@github.com>
Thu, 30 Jan 2025 16:49:03 +0000 (17:49 +0100)
* fix

* oh right

Content.Server/Cargo/Systems/CargoSystem.Orders.cs

index e05b33e975be78065bd210f092ff87c46b0f89fc..9dbd2b88dcab2a89c0833bc3ac8819b9b1233d7d 100644 (file)
@@ -98,9 +98,11 @@ namespace Content.Server.Cargo.Systems
             {
                 _timer -= Delay;
 
-                foreach (var account in EntityQuery<StationBankAccountComponent>())
+                var stationQuery = EntityQueryEnumerator<StationBankAccountComponent>();
+                while (stationQuery.MoveNext(out var uid, out var bank))
                 {
-                    account.Balance += account.IncreasePerSecond * Delay;
+                    var balanceToAdd = bank.IncreasePerSecond * Delay;
+                    UpdateBankAccount(uid, bank, balanceToAdd);
                 }
 
                 var query = EntityQueryEnumerator<CargoOrderConsoleComponent>();
@@ -226,7 +228,7 @@ namespace Content.Server.Cargo.Systems
                 $"{ToPrettyString(player):user} approved order [orderId:{order.OrderId}, quantity:{order.OrderQuantity}, product:{order.ProductId}, requester:{order.Requester}, reason:{order.Reason}] with balance at {bank.Balance}");
 
             orderDatabase.Orders.Remove(order);
-            DeductFunds(bank, cost);
+            UpdateBankAccount(station.Value, bank, -cost);
             UpdateOrders(station.Value);
         }
 
@@ -549,11 +551,6 @@ namespace Content.Server.Cargo.Systems
 
         }
 
-        private void DeductFunds(StationBankAccountComponent component, int amount)
-        {
-            component.Balance = Math.Max(0, component.Balance - amount);
-        }
-
         #region Station
 
         private bool TryGetOrderDatabase([NotNullWhen(true)] EntityUid? stationUid, [MaybeNullWhen(false)] out StationCargoOrderDatabaseComponent dbComp)