From 8fe57e80df70af06206b179645478d68ba77947b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 31 May 2015 16:07:55 +0200 Subject: [PATCH] fix an explicit NRE from Demolish.OnInside --- OpenRA.Mods.Common/Traits/Infantry/TerrainModifiesDamage.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Traits/Infantry/TerrainModifiesDamage.cs b/OpenRA.Mods.Common/Traits/Infantry/TerrainModifiesDamage.cs index 02f77edb26..a564f484de 100644 --- a/OpenRA.Mods.Common/Traits/Infantry/TerrainModifiesDamage.cs +++ b/OpenRA.Mods.Common/Traits/Infantry/TerrainModifiesDamage.cs @@ -55,7 +55,7 @@ namespace OpenRA.Mods.Common.Traits public int GetDamageModifier(Actor attacker, DamageWarhead warhead) { var percent = 100; - if (attacker.Owner.IsAlliedWith(self.Owner) && warhead.Damage < 0 && !Info.ModifyHealing) + if (attacker.Owner.IsAlliedWith(self.Owner) && (warhead != null && warhead.Damage < 0) && !Info.ModifyHealing) return percent; var world = self.World;