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

Fix PickupUnit not validating cargo on first run.

Browse Source
This commit is contained in:
matjaeck
2020-06-18 23:12:06 +02:00
committed by reaperrr
parent 3bce55ac44
commit 5280637adf
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,10 @@ namespace OpenRA.Mods.Common.Activities
protected override void OnFirstRun(Actor self) protected override void OnFirstRun(Actor self)
{ {
// The cargo might have become invalid while we were moving towards it.
if (cargo.IsDead || carryable.IsTraitDisabled || !cargo.AppearsFriendlyTo(self))
return;
if (carryall.ReserveCarryable(self, cargo)) if (carryall.ReserveCarryable(self, cargo))
{ {
// Fly to the target and wait for it to be locked for pickup // Fly to the target and wait for it to be locked for pickup