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

Merge pull request #8318 from Mailaender/hackyai-nre-attacker

Browse Source 
Fixed possible NREs in HackyAI.Damaged
This commit is contained in:
Oliver Brakmann
2015-05-31 17:07:33 +02:00
parent e4fcb65808 f171b23a1b
commit b5bae91bb0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/AI/HackyAI.cs
View File

@@ -926,7 +926,7 @@ namespace OpenRA.Mods.Common.AI
public void Damaged(Actor self, AttackInfo e)
{
if (!enabled)
if (!enabled || e.Attacker == null)
return;
if (e.Attacker.Owner.Stances[self.Owner] == Stance.Neutral)
@@ -950,7 +950,7 @@ namespace OpenRA.Mods.Common.AI
if (!e.Attacker.HasTrait<ITargetable>())
return;
if (e.Attacker != null && e.Damage > 0)
if (e.Damage > 0)
aggro[e.Attacker.Owner].Aggro += e.Damage;
// Protected harvesters or building