From adeb2a19cac59e647cb63ee0ef3390ae03dbf217 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 13 Aug 2016 00:00:28 +0200 Subject: [PATCH] Remove bogus 'OrDefault' from UpgradeOnDamage UpgradeManager is required anyway, so this was redundant. --- OpenRA.Mods.Common/Traits/Upgrades/UpgradeOnDamage.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Upgrades/UpgradeOnDamage.cs b/OpenRA.Mods.Common/Traits/Upgrades/UpgradeOnDamage.cs index c171a49af8..a66f9fd180 100644 --- a/OpenRA.Mods.Common/Traits/Upgrades/UpgradeOnDamage.cs +++ b/OpenRA.Mods.Common/Traits/Upgrades/UpgradeOnDamage.cs @@ -44,14 +44,11 @@ namespace OpenRA.Mods.Common.Traits public UpgradeOnDamage(Actor self, UpgradeOnDamageInfo info) { this.info = info; - um = self.TraitOrDefault(); + um = self.Trait(); } void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e) { - if (um == null) - return; - if (granted && info.GrantPermanently) return;