From 24c293e8217f4b548bc1ace3f13e1824218967f0 Mon Sep 17 00:00:00 2001
From: abcdefg30 <alphabet@streber24.de>
Date: Wed, 4 Oct 2017 17:19:06 +0200
Subject: [PATCH] Fix Cargo force-requiring ConditionManager

---
 OpenRA.Mods.Common/Traits/Cargo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenRA.Mods.Common/Traits/Cargo.cs b/OpenRA.Mods.Common/Traits/Cargo.cs
index 0db3440b2f..f82bf2bd40 100644
--- a/OpenRA.Mods.Common/Traits/Cargo.cs
+++ b/OpenRA.Mods.Common/Traits/Cargo.cs
@@ -141,7 +141,7 @@ namespace OpenRA.Mods.Common.Traits
 		void INotifyCreated.Created(Actor self)
 		{
 			aircraft = self.TraitOrDefault<Aircraft>();
-			conditionManager = self.Trait<ConditionManager>();
+			conditionManager = self.TraitOrDefault<ConditionManager>();
 		}
 
 		static int GetWeight(Actor a) { return a.Info.TraitInfo<PassengerInfo>().Weight; }