epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12826 from MustaphaTR/d2k-fix-carryall-owner-change

Browse Source 
Fix that Carryalls still pick units changed their owner
This commit is contained in:
reaperrr
2017-02-27 21:14:46 +01:00
committed by GitHub
parent cbd693c89f bf0c4f7e1a
commit e06e19e39f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Activities/PickupUnit.cs
View File

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