From b50f15c645303294313aa3bf4dc4996c352514dc Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Mon, 17 Apr 2017 19:31:53 +0200 Subject: [PATCH] Check for dead destination helipad in HeliReturnToBase --- OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs b/OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs index d53c54b8b7..3fae88b03e 100644 --- a/OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs +++ b/OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs @@ -43,12 +43,12 @@ namespace OpenRA.Mods.Common.Activities if (IsCanceled) return NextActivity; - if (dest == null || Reservable.IsReserved(dest)) + if (dest == null || dest.IsDead || Reservable.IsReserved(dest)) dest = ChooseHelipad(self); var initialFacing = heli.Info.InitialFacing; - if (dest == null) + if (dest == null || dest.IsDead) { var rearmBuildings = heli.Info.RearmBuildings; var nearestHpad = self.World.ActorsHavingTrait()