fix an explicit NRE from Demolish.OnInside

This commit is contained in:
Matthias Mailänder
2015-05-31 16:07:55 +02:00
parent a12e6a191b
commit 8fe57e80df

View File

@@ -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;