Replace Upgrades with Conditions in Carryable.

This commit is contained in:
Paul Chote
2016-11-19 16:56:09 +00:00
parent dc7fa14992
commit 2dc70146c8
3 changed files with 33 additions and 18 deletions

View File

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.Common.Activities
if (cargo != carryall.Carryable)
return NextActivity;
if (cargo.IsDead || IsCanceled)
if (cargo.IsDead || IsCanceled || carryable.IsTraitDisabled)
{
carryall.UnreserveCarryable(self);
return NextActivity;