Skip DoImpact if actor has no Health trait

This commit is contained in:
reaperrr
2015-10-25 11:58:12 +01:00
parent 92c05912e1
commit fa29b16967

View File

@@ -65,13 +65,13 @@ namespace OpenRA.Mods.Common.Warheads
if (!IsValidAgainst(victim, firedBy))
continue;
var localModifiers = damageModifiers;
var healthInfo = victim.Info.TraitInfoOrDefault<HealthInfo>();
if (healthInfo != null)
{
var distance = Math.Max(0, (victim.CenterPosition - pos).Length - healthInfo.Radius.Length);
localModifiers = localModifiers.Append(GetDamageFalloff(distance));
}
if (healthInfo == null)
continue;
var localModifiers = damageModifiers;
var distance = Math.Max(0, (victim.CenterPosition - pos).Length - healthInfo.Radius.Length);
localModifiers = localModifiers.Append(GetDamageFalloff(distance));
DoImpact(victim, firedBy, localModifiers);
}