From db2fded24d700ab5015b80ce004c0a2d98da4700 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 10 Jan 2021 11:55:07 +0000 Subject: [PATCH] Fix AutoTarget.ChooseTarget ignoring AttackBase.TargetFrozenActors. --- OpenRA.Mods.Common/Traits/AutoTarget.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/AutoTarget.cs b/OpenRA.Mods.Common/Traits/AutoTarget.cs index 3dec00de01..7f77c856a6 100644 --- a/OpenRA.Mods.Common/Traits/AutoTarget.cs +++ b/OpenRA.Mods.Common/Traits/AutoTarget.cs @@ -348,8 +348,11 @@ namespace OpenRA.Mods.Common.Traits return chosenTarget; var targetsInRange = self.World.FindActorsInCircle(self.CenterPosition, scanRange) - .Select(Target.FromActor) - .Concat(self.Owner.FrozenActorLayer.FrozenActorsInCircle(self.World, self.CenterPosition, scanRange) + .Select(Target.FromActor); + + if (allowMove || ab.Info.TargetFrozenActors) + targetsInRange = targetsInRange + .Concat(self.Owner.FrozenActorLayer.FrozenActorsInCircle(self.World, self.CenterPosition, scanRange) .Select(Target.FromFrozenActor)); foreach (var target in targetsInRange)