Merge pull request #5894 from pchote/warhead-nre

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

View File

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