Replace Upgrades with Conditions in Carryable.

2016-11-19 16:56:09 +00:00
parent dc7fa14992
commit 2dc70146c8
3 changed files with 33 additions and 18 deletions
--- a/OpenRA.Mods.Common/Traits/Carryall.cs
+++ b/OpenRA.Mods.Common/Traits/Carryall.cs
@@ -283,11 +283,14 @@ namespace OpenRA.Mods.Common.Traits
 			{
 				if (!target.AppearsFriendlyTo(self))
 					return false;
+
 				var carryable = target.TraitOrDefault<Carryable>();
-				if (carryable == null)
+				if (carryable == null || carryable.IsTraitDisabled)
 					return false;
+
 				if (carryable.Reserved && carryable.Carrier != self)
 					return false;
+
 				return true;
 			}