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

Fix crash caused by queuing multiple pick up orders for a single unit.

Browse Source
This commit is contained in:
darkademic
2024-05-25 09:00:05 +01:00
committed by Gustas
parent 69d9bbb400
commit b693f20789
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ namespace OpenRA.Mods.Common.Activities
enum PickupState { Intercept, LockCarryable, Pickup } enum PickupState { Intercept, LockCarryable, Pickup }
PickupState state = PickupState.Intercept; PickupState state = PickupState.Intercept;
bool reserveFailed;
public PickupUnit(Actor self, Actor cargo, int delay, Color? targetLineColor) public PickupUnit(Actor self, Actor cargo, int delay, Color? targetLineColor)
{ {
@@ -52,7 +53,10 @@ namespace OpenRA.Mods.Common.Activities
{ {
// The cargo might have become invalid while we were moving towards it. // The cargo might have become invalid while we were moving towards it.
if (cargo.IsDead || carryable.IsTraitDisabled || carryall.IsTraitDisabled || !cargo.AppearsFriendlyTo(self)) if (cargo.IsDead || carryable.IsTraitDisabled || carryall.IsTraitDisabled || !cargo.AppearsFriendlyTo(self))
{
reserveFailed = true;
return; return;
}
if (carryall.ReserveCarryable(self, cargo)) if (carryall.ReserveCarryable(self, cargo))
{ {
@@ -61,11 +65,13 @@ namespace OpenRA.Mods.Common.Activities
QueueChild(new Fly(self, Target.FromActor(cargo))); QueueChild(new Fly(self, Target.FromActor(cargo)));
QueueChild(new FlyIdle(self, idleTurn: false)); QueueChild(new FlyIdle(self, idleTurn: false));
} }
else
reserveFailed = true;
} }
public override bool Tick(Actor self) public override bool Tick(Actor self)
{ {
if (IsCanceling) if (IsCanceling || reserveFailed)
return true; return true;
if (cargo.IsDead || carryable.IsTraitDisabled || carryall.IsTraitDisabled || !cargo.AppearsFriendlyTo(self) || cargo != carryall.Carryable) if (cargo.IsDead || carryable.IsTraitDisabled || carryall.IsTraitDisabled || !cargo.AppearsFriendlyTo(self) || cargo != carryall.Carryable)