From 83b559befca73c0677865f0eeceacb19da7fa8dc Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 9 Jul 2014 18:01:51 +1200 Subject: [PATCH] Fix NRE if a unit is damaged without a warhead. --- OpenRA.Mods.RA/TakeCover.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenRA.Mods.RA/TakeCover.cs b/OpenRA.Mods.RA/TakeCover.cs index 77cdb0301b..8c4945a761 100644 --- a/OpenRA.Mods.RA/TakeCover.cs +++ b/OpenRA.Mods.RA/TakeCover.cs @@ -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()