From 1e64048956e59c0c077115732047865a711d66d0 Mon Sep 17 00:00:00 2001
From: abcdefg30 <alphabet@streber24.de>
Date: Thu, 5 Mar 2020 13:01:42 +0100
Subject: [PATCH] Cache PlayerResources and unit cost in Resupply

---
 OpenRA.Mods.Common/Activities/Resupply.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/OpenRA.Mods.Common/Activities/Resupply.cs b/OpenRA.Mods.Common/Activities/Resupply.cs
index bdcc05ed64..d162c34c55 100644
--- a/OpenRA.Mods.Common/Activities/Resupply.cs
+++ b/OpenRA.Mods.Common/Activities/Resupply.cs
@@ -34,6 +34,8 @@ namespace OpenRA.Mods.Common.Activities
 		readonly Aircraft aircraft;
 		readonly bool stayOnResupplier;
 		readonly bool wasRepaired;
+		readonly PlayerResources playerResources;
+		readonly int unitCost;
 
 		int remainingTicks;
 		bool played;
@@ -54,6 +56,10 @@ namespace OpenRA.Mods.Common.Activities
 			transportCallers = self.TraitsImplementing<ICallForTransport>().ToArray();
 			move = self.Trait<IMove>();
 			aircraft = move as Aircraft;
+			playerResources = self.Owner.PlayerActor.Trait<PlayerResources>();
+
+			var valued = self.Info.TraitInfoOrDefault<ValuedInfo>();
+			unitCost = valued != null ? valued.Cost : 0;
 
 			var cannotRepairAtHost = health == null || health.DamageState == DamageState.Undamaged
 				|| !allRepairsUnits.Any()
@@ -221,7 +227,6 @@ namespace OpenRA.Mods.Common.Activities
 
 		void RepairTick(Actor self)
 		{
-			// First active.
 			var repairsUnits = allRepairsUnits.FirstOrDefault(r => !r.IsTraitDisabled && !r.IsTraitPaused);
 			if (repairsUnits == null)
 			{
@@ -248,8 +253,6 @@ namespace OpenRA.Mods.Common.Activities
 
 			if (remainingTicks == 0)
 			{
-				var valued = self.Info.TraitInfoOrDefault<ValuedInfo>();
-				var unitCost = valued != null ? valued.Cost : 0;
 				var hpToRepair = repairable != null && repairable.Info.HpPerStep > 0 ? repairable.Info.HpPerStep : repairsUnits.Info.HpPerStep;
 
 				// Cast to long to avoid overflow when multiplying by the health
@@ -261,7 +264,7 @@ namespace OpenRA.Mods.Common.Activities
 					Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", repairsUnits.Info.StartRepairingNotification, self.Owner.Faction.InternalName);
 				}
 
-				if (!self.Owner.PlayerActor.Trait<PlayerResources>().TakeCash(cost, true))
+				if (!playerResources.TakeCash(cost, true))
 				{
 					remainingTicks = 1;
 					return;