From cec348c462707919fba5488a79553a52ac2243d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 5 Oct 2013 21:47:23 +0200 Subject: [PATCH] don't explode when not in world fixes #3895 StyleCop cleanup --- OpenRA.Mods.RA/Explodes.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/OpenRA.Mods.RA/Explodes.cs b/OpenRA.Mods.RA/Explodes.cs index 96b2bd1b0a..c99dc5e68f 100644 --- a/OpenRA.Mods.RA/Explodes.cs +++ b/OpenRA.Mods.RA/Explodes.cs @@ -23,21 +23,24 @@ namespace OpenRA.Mods.RA public readonly int Chance = 100; public readonly int[] InfDeath = null; - public object Create (ActorInitializer init) { return new Explodes(this); } + public object Create(ActorInitializer init) { return new Explodes(this); } } class Explodes : INotifyKilled { - readonly ExplodesInfo Info; + readonly ExplodesInfo explodesInfo; - public Explodes( ExplodesInfo info ) { Info = info; } + public Explodes(ExplodesInfo info) { explodesInfo = info; } public void Killed(Actor self, AttackInfo e) { - if (self.World.SharedRandom.Next(100) > Info.Chance) + if (!self.IsInWorld) return; - if (Info.InfDeath != null && e.Warhead != null && !Info.InfDeath.Contains(e.Warhead.InfDeath)) + if (self.World.SharedRandom.Next(100) > explodesInfo.Chance) + return; + + if (explodesInfo.InfDeath != null && e.Warhead != null && !explodesInfo.InfDeath.Contains(e.Warhead.InfDeath)) return; var weapon = ChooseWeaponForExplosion(self); @@ -48,7 +51,7 @@ namespace OpenRA.Mods.RA string ChooseWeaponForExplosion(Actor self) { var shouldExplode = self.TraitsImplementing().All(a => a.ShouldExplode(self)); - return shouldExplode ? Info.Weapon : Info.EmptyWeapon; + return shouldExplode ? explodesInfo.Weapon : explodesInfo.EmptyWeapon; } } }