From b95f49d6f302145d52546cf12735f669b63e6891 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sun, 21 Aug 2011 19:34:45 +1200 Subject: [PATCH] remove pointless null checks for owner --- OpenRA.Mods.RA/Activities/LayMines.cs | 2 +- OpenRA.Mods.RA/AutoTarget.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.RA/Activities/LayMines.cs b/OpenRA.Mods.RA/Activities/LayMines.cs index c2865704c9..861154156c 100644 --- a/OpenRA.Mods.RA/Activities/LayMines.cs +++ b/OpenRA.Mods.RA/Activities/LayMines.cs @@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA.Activities { // rearm & repair at fix, then back out here to refill the minefield some more var buildings = self.Info.Traits.Get().RearmBuildings; - var rearmTarget = self.World.Actors.Where(a => a.Owner != null && self.Owner.Stances[a.Owner] == Stance.Ally + var rearmTarget = self.World.Actors.Where(a => self.Owner.Stances[a.Owner] == Stance.Ally && buildings.Contains(a.Info.Name)) .ClosestTo( self.CenterLocation ); diff --git a/OpenRA.Mods.RA/AutoTarget.cs b/OpenRA.Mods.RA/AutoTarget.cs index a9c29d284e..5b38fa2b94 100644 --- a/OpenRA.Mods.RA/AutoTarget.cs +++ b/OpenRA.Mods.RA/AutoTarget.cs @@ -98,7 +98,7 @@ namespace OpenRA.Mods.RA var inRange = self.World.FindUnitsInCircle(self.CenterLocation, (int)(Game.CellSize * range)); return inRange - .Where(a => a.Owner != null && a.AppearsHostileTo(self)) + .Where(a => a.AppearsHostileTo(self)) .Where(a => !a.HasTrait()) .Where(a => attack.HasAnyValidWeapons(Target.FromActor(a))) .ClosestTo( self.CenterLocation );