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

Fix the command bar selecting dead units

Browse Source 
and crashing while doing a trait lookup on them.
This commit is contained in:
Matthias Mailänder
2020-10-10 20:48:47 +02:00
committed by abcdefg30
parent 8a7020b4ef
commit 0d64fa549b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Traits/Minelayer.cs
View File

@@ -218,7 +218,7 @@ namespace OpenRA.Mods.Cnc.Traits
protected override void SelectionChanged(World world, IEnumerable<Actor> selected) protected override void SelectionChanged(World world, IEnumerable<Actor> selected)
{ {
minelayers.Clear(); minelayers.Clear();
minelayers.AddRange(selected.Where(s => s.Info.HasTraitInfo<MinelayerInfo>())); minelayers.AddRange(selected.Where(s => !s.IsDead && s.Info.HasTraitInfo<MinelayerInfo>()));
if (!minelayers.Any()) if (!minelayers.Any())
world.CancelInputMode(); world.CancelInputMode();
} }

2
OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Orders
public override void SelectionChanged(World world, IEnumerable<Actor> selected) public override void SelectionChanged(World world, IEnumerable<Actor> selected)
{ {
// Guarding doesn't work without AutoTarget, so require at least one unit in the selection to have it // Guarding doesn't work without AutoTarget, so require at least one unit in the selection to have it
subjects = selected.Where(s => s.Info.HasTraitInfo<GuardInfo>()); subjects = selected.Where(s => !s.IsDead && s.Info.HasTraitInfo<GuardInfo>());
if (!subjects.Any(s => s.Info.HasTraitInfo<AutoTargetInfo>())) if (!subjects.Any(s => s.Info.HasTraitInfo<AutoTargetInfo>()))
world.CancelInputMode(); world.CancelInputMode();
} }

2
OpenRA.Mods.Common/Traits/AttackMove.cs
View File

@@ -123,7 +123,7 @@ namespace OpenRA.Mods.Common.Traits
public override void SelectionChanged(World world, IEnumerable<Actor> selected) public override void SelectionChanged(World world, IEnumerable<Actor> selected)
{ {
subjects = selected.SelectMany(a => a.TraitsImplementing<AttackMove>() subjects = selected.Where(s => !s.IsDead).SelectMany(a => a.TraitsImplementing<AttackMove>()
.Select(am => new TraitPair<AttackMove>(a, am))) .Select(am => new TraitPair<AttackMove>(a, am)))
.ToArray(); .ToArray();