diff --git a/OpenRA.Mods.RA/AI/HackyAI.cs b/OpenRA.Mods.RA/AI/HackyAI.cs index 0de0905132..5c12c0935e 100644 --- a/OpenRA.Mods.RA/AI/HackyAI.cs +++ b/OpenRA.Mods.RA/AI/HackyAI.cs @@ -479,7 +479,7 @@ namespace OpenRA.Mods.RA.AI { squads.RemoveAll(s => !s.IsValid); foreach (var s in squads) - s.units.RemoveAll(a => a.Destroyed || a.IsDead() || a.Owner != p); + s.units.RemoveAll(a => a.IsDead() || a.Owner != p); } // Use of this function requires that one squad of this type. Hence it is a piece of shit @@ -506,8 +506,8 @@ namespace OpenRA.Mods.RA.AI void AssignRolesToIdleUnits(Actor self) { CleanSquads(); - activeUnits.RemoveAll(a => a.Destroyed || a.IsDead() || a.Owner != p); - unitsHangingAroundTheBase.RemoveAll(a => a.Destroyed || a.IsDead() || a.Owner != p); + activeUnits.RemoveAll(a => a.IsDead() || a.Owner != p); + unitsHangingAroundTheBase.RemoveAll(a => a.IsDead() || a.Owner != p); if (--rushTicks <= 0) { diff --git a/OpenRA.Mods.RA/Effects/GpsDot.cs b/OpenRA.Mods.RA/Effects/GpsDot.cs index 3bc28aea69..3497ba39b1 100644 --- a/OpenRA.Mods.RA/Effects/GpsDot.cs +++ b/OpenRA.Mods.RA/Effects/GpsDot.cs @@ -87,7 +87,7 @@ namespace OpenRA.Mods.RA.Effects world.AddFrameEndTask(w => w.Remove(this)); show = false; - if (!self.IsInWorld || self.Destroyed || self.IsDead() || self.World.RenderPlayer == null) + if (!self.IsInWorld || self.IsDead() || self.World.RenderPlayer == null) return; var gps = watcher[self.World.RenderPlayer]; diff --git a/OpenRA.Mods.RA/Effects/InvulnEffect.cs b/OpenRA.Mods.RA/Effects/InvulnEffect.cs index f7ca41773c..e15c00b346 100644 --- a/OpenRA.Mods.RA/Effects/InvulnEffect.cs +++ b/OpenRA.Mods.RA/Effects/InvulnEffect.cs @@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA.Effects public void Tick( World world ) { - if (a.Destroyed || a.IsDead() || b.GetDamageModifier(null, null) > 0) + if (a.IsDead() || b.GetDamageModifier(null, null) > 0) world.AddFrameEndTask(w => w.Remove(this)); }