Merge pull request #12411 from pchote/fix-multiplesight-crash

Fix crash when actors with multiple RevealsShroud target a dead frozen actor.
This commit is contained in:
Oliver Brakmann
2016-12-10 20:56:08 +01:00
committed by GitHub

View File

@@ -91,8 +91,11 @@ namespace OpenRA.Mods.Common
if (move != null)
{
// Move within sight range of the frozen actor
var sight = self.TraitOrDefault<RevealsShroud>();
var range = sight != null ? sight.Range : WDist.FromCells(2);
var range = self.TraitsImplementing<RevealsShroud>()
.Where(s => !s.IsTraitDisabled)
.Select(s => s.Range)
.Append(WDist.FromCells(2))
.Max();
self.QueueActivity(move.MoveWithinRange(Target.FromPos(frozen.CenterPosition), range));
}