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

Merge pull request #4037 from Phrohdoh/EngineerFalseAttackWarning

Browse Source 
Fixes #3963
This commit is contained in:
Matthias Mailänder
2013-10-31 10:58:34 -07:00
parent 094d5929b1 dd17a99ab5
commit cf1f7e0d1e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.RA/Player/BaseAttackNotifier.cs
View File

@@ -37,8 +37,13 @@ namespace OpenRA.Mods.RA
if (!self.HasTrait<Building>())
return;
// don't track self-damage
if (e.Attacker != null && e.Attacker.Owner == self.Owner)
if (e.Attacker == null)
return;
if (e.Attacker.Owner == self.Owner)
return;
if (e.Attacker.Owner.IsAlliedWith(self.Owner) && e.Damage <= 0)
return;
if (self.World.FrameNumber - lastAttackTime > info.NotifyInterval * 25)