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

Merge pull request #13148 from obrakmann/fix13147_fix-rtb-dead-dest-race

Browse Source 
Check for dead destination airfield in ReturnToBase
This commit is contained in:
reaperrr
2017-04-17 20:41:39 +02:00
committed by GitHub
parent 6df453f806 b50f15c645
commit 2548e62e31
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs
View File

@@ -43,12 +43,12 @@ namespace OpenRA.Mods.Common.Activities
if (IsCanceled) if (IsCanceled)
return NextActivity; return NextActivity;
if (dest == null || Reservable.IsReserved(dest)) if (dest == null || dest.IsDead || Reservable.IsReserved(dest))
dest = ChooseHelipad(self); dest = ChooseHelipad(self);
var initialFacing = heli.Info.InitialFacing; var initialFacing = heli.Info.InitialFacing;
if (dest == null) if (dest == null || dest.IsDead)
{ {
var rearmBuildings = heli.Info.RearmBuildings; var rearmBuildings = heli.Info.RearmBuildings;
var nearestHpad = self.World.ActorsHavingTrait<Reservable>() var nearestHpad = self.World.ActorsHavingTrait<Reservable>()

4
OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Activities
void Calculate(Actor self) void Calculate(Actor self)
{ {
if (dest == null || Reservable.IsReserved(dest)) if (dest == null || dest.IsDead || Reservable.IsReserved(dest))
dest = ChooseAirfield(self, true); dest = ChooseAirfield(self, true);
if (dest == null) if (dest == null)
@@ -116,7 +116,7 @@ namespace OpenRA.Mods.Common.Activities
if (!isCalculated) if (!isCalculated)
Calculate(self); Calculate(self);
if (dest == null) if (dest == null || dest.IsDead)
{ {
var nearestAfld = ChooseAirfield(self, false); var nearestAfld = ChooseAirfield(self, false);