From e2f3989f4693fa4f13221f28c7f4a511936ebeae Mon Sep 17 00:00:00 2001
From: Mustafa Alperen Seki <mustafaoyunda37@gmail.com>
Date: Sat, 9 Dec 2017 20:10:36 +0300
Subject: [PATCH] Fix that conditions for InitialUnits are not given

---
 OpenRA.Mods.Common/Traits/Cargo.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/OpenRA.Mods.Common/Traits/Cargo.cs b/OpenRA.Mods.Common/Traits/Cargo.cs
index f82bf2bd40..6ccc41ca6d 100644
--- a/OpenRA.Mods.Common/Traits/Cargo.cs
+++ b/OpenRA.Mods.Common/Traits/Cargo.cs
@@ -142,6 +142,19 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			aircraft = self.TraitOrDefault<Aircraft>();
 			conditionManager = self.TraitOrDefault<ConditionManager>();
+
+			if (conditionManager != null && cargo.Any())
+			{
+				foreach (var c in cargo)
+				{
+					string passengerCondition;
+					if (Info.PassengerConditions.TryGetValue(c.Info.Name, out passengerCondition))
+						passengerTokens.GetOrAdd(c.Info.Name).Push(conditionManager.GrantCondition(self, passengerCondition));
+				}
+
+				if (!string.IsNullOrEmpty(Info.LoadedCondition))
+					loadedTokens.Push(conditionManager.GrantCondition(self, Info.LoadedCondition));
+			}
 		}
 
 		static int GetWeight(Actor a) { return a.Info.TraitInfo<PassengerInfo>().Weight; }