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

Prevent carryalls picking up non-existent units.

Browse Source
This commit is contained in:
tovl
2019-07-07 21:40:02 +02:00
committed by abcdefg30
parent 0562814efa
commit 71a1060ecb
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,7 +101,7 @@ namespace OpenRA.Mods.Common.Activities
QueueChild(new Wait(delay, false)); QueueChild(new Wait(delay, false));
// Remove our carryable from world // Remove our carryable from world
QueueChild(new CallFunc(() => Attach(self))); QueueChild(new AttachUnit(self, cargo));
QueueChild(new TakeOff(self)); QueueChild(new TakeOff(self));
return false; return false;
} }
@@ -110,14 +110,32 @@ namespace OpenRA.Mods.Common.Activities
return true; return true;
} }
void Attach(Actor self) class AttachUnit : Activity
{ {
self.World.AddFrameEndTask(w => readonly Actor cargo;
readonly Carryable carryable;
readonly Carryall carryall;
public AttachUnit(Actor self, Actor cargo)
{ {
cargo.World.Remove(cargo); this.cargo = cargo;
carryable.Attached(cargo); carryable = cargo.Trait<Carryable>();
carryall.AttachCarryable(self, cargo); carryall = self.Trait<Carryall>();
}); }
protected override void OnFirstRun(Actor self)
{
// The cargo might have become invalid while we were moving towards it.
if (cargo == null || cargo.IsDead || carryable.IsTraitDisabled || !cargo.AppearsFriendlyTo(self))
return;
self.World.AddFrameEndTask(w =>
{
cargo.World.Remove(cargo);
carryable.Attached(cargo);
carryall.AttachCarryable(self, cargo);
});
}
} }
} }
} }