epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix an explicit NRE from Demolish.OnInside

Browse Source
This commit is contained in:
Matthias Mailänder
2015-05-31 16:07:55 +02:00
parent a12e6a191b
commit 8fe57e80df
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/Infantry/TerrainModifiesDamage.cs
View File

@@ -55,7 +55,7 @@ namespace OpenRA.Mods.Common.Traits
public int GetDamageModifier(Actor attacker, DamageWarhead warhead) public int GetDamageModifier(Actor attacker, DamageWarhead warhead)
{ {
var percent = 100; 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; return percent;
var world = self.World; var world = self.World;