From 83cd7cf485b5c2ae8ac35fe3c7f0d924f51eaed9 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 20 Sep 2018 16:35:08 +0200 Subject: [PATCH] Merge two ifs in RevealOnDeath --- OpenRA.Mods.Common/Traits/RevealOnDeath.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/RevealOnDeath.cs b/OpenRA.Mods.Common/Traits/RevealOnDeath.cs index af1973e5db..8d4dfce29b 100644 --- a/OpenRA.Mods.Common/Traits/RevealOnDeath.cs +++ b/OpenRA.Mods.Common/Traits/RevealOnDeath.cs @@ -51,10 +51,7 @@ namespace OpenRA.Mods.Common.Traits void INotifyKilled.Killed(Actor self, AttackInfo attack) { - if (IsTraitDisabled) - return; - - if (!self.IsInWorld) + if (IsTraitDisabled || !self.IsInWorld) return; if (!info.DeathTypes.IsEmpty && !attack.Damage.DamageTypes.Overlaps(info.DeathTypes))