From 996344ea6ef3adfbd87b1750ee5acf16f51d9a69 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 27 May 2010 22:02:36 +1200 Subject: [PATCH] fix crash in EmitInfantryOnSell when destroying things that are not Valued --- OpenRA.Mods.RA/EmitInfantryOnSell.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/EmitInfantryOnSell.cs b/OpenRA.Mods.RA/EmitInfantryOnSell.cs index 2be158eea9..3b1248e836 100644 --- a/OpenRA.Mods.RA/EmitInfantryOnSell.cs +++ b/OpenRA.Mods.RA/EmitInfantryOnSell.cs @@ -40,7 +40,8 @@ namespace OpenRA.Mods.RA { var info = self.Info.Traits.Get(); var csv = self.Info.Traits.GetOrDefault(); - var cost = csv != null ? csv.Value : self.Info.Traits.Get().Cost; + var valued = self.Info.Traits.GetOrDefault(); + var cost = csv != null ? csv.Value : (valued != null ? valued.Cost : 0); var hp = self.Info.Traits.Get().HP; var hpFraction = Math.Max(info.MinHpFraction, hp / self.GetMaxHP()); var dudesValue = (int)(hpFraction * info.ValueFraction * cost);