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

Merge pull request #5894 from pchote/warhead-nre

Browse Source 
Fix NRE if a unit is damaged without a warhead.
This commit is contained in:
Matthias Mailänder
2014-07-09 08:12:08 +02:00
parent 5e96bb3f8c 83b559befc
commit 3491d3b9f8
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.RA/TakeCover.cs
View File

@@ -57,8 +57,7 @@ namespace OpenRA.Mods.RA
public float GetDamageModifier(Actor attacker, WarheadInfo warhead) public float GetDamageModifier(Actor attacker, WarheadInfo warhead)
{ {
var proneDamage = (warhead.ProneModifier / 100f); return IsProne && warhead != null ? warhead.ProneModifier / 100f : 1f;
return IsProne ? proneDamage : 1f;
} }
public decimal GetSpeedModifier() public decimal GetSpeedModifier()