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

Make AutoTarget handling of AttackFollow more robust

Browse Source 
At least in theory, it's possible for an actor to have multiple AttackFollow traits, or AttackFollow is disabled initially but enabled via upgrade later.
To avoid crashes or other issues, let's play it safe and take the same approach as with AttackBase look-ups.
This commit is contained in:
reaperrr
2016-05-14 12:43:49 +02:00
parent 2a19f66a0e
commit 6089599b3f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/AutoTarget.cs
View File

@@ -53,7 +53,7 @@ namespace OpenRA.Mods.Common.Traits
public class AutoTarget : UpgradableTrait<AutoTargetInfo>, INotifyIdle, INotifyDamage, ITick, IResolveOrder, ISync
{
readonly AttackBase[] attackBases;
readonly AttackFollow attackFollow;
readonly AttackFollow[] attackFollows;
[Sync] int nextScanTime = 0;
public UnitStance Stance;
@@ -75,7 +75,7 @@ namespace OpenRA.Mods.Common.Traits
Stance = self.Owner.IsBot || !self.Owner.Playable ? info.InitialStanceAI : info.InitialStance;
PredictedStance = Stance;
attackFollow = self.TraitsImplementing<AttackFollow>().FirstOrDefault(Exts.IsTraitEnabled);
attackFollows = self.TraitsImplementing<AttackFollow>().ToArray();
}
public void ResolveOrder(Actor self, Order order)
@@ -118,7 +118,7 @@ namespace OpenRA.Mods.Common.Traits
Aggressor = attacker;
var allowMove = Info.AllowMovement && Stance != UnitStance.Defend;
if (attackFollow == null || !attackFollow.IsReachableTarget(attackFollow.Target, allowMove))
if (attackFollows.All(a => a.IsTraitDisabled || !a.IsReachableTarget(a.Target, allowMove)))
Attack(self, Aggressor, allowMove);
}
@@ -131,7 +131,7 @@ namespace OpenRA.Mods.Common.Traits
return;
var allowMove = Info.AllowMovement && Stance != UnitStance.Defend;
if (attackFollow == null || !attackFollow.IsReachableTarget(attackFollow.Target, allowMove))
if (attackFollows.All(a => a.IsTraitDisabled || !a.IsReachableTarget(a.Target, allowMove)))
ScanAndAttack(self, allowMove);
}