From b12a35af4cf146eed8728742565b786cb51a1b19 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Wed, 4 May 2011 20:41:44 +1200
Subject: [PATCH] more trivial cleanups

---
 OpenRA.Mods.RA/Player/PlaceBuilding.cs   | 8 ++++----
 OpenRA.Mods.RA/Player/ProductionQueue.cs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/OpenRA.Mods.RA/Player/PlaceBuilding.cs b/OpenRA.Mods.RA/Player/PlaceBuilding.cs
index a8e375cd8e..72d70433c4 100755
--- a/OpenRA.Mods.RA/Player/PlaceBuilding.cs
+++ b/OpenRA.Mods.RA/Player/PlaceBuilding.cs
@@ -96,14 +96,14 @@ namespace OpenRA.Mods.RA
 				return;
 			
 			var producers = self.World.ActorsWithTrait<Production>()
-                               .Where( x => x.Actor.Owner == self.Owner )
-							   .Where( x => x.Actor.Info.Traits.Get<ProductionInfo>().Produces.Contains( bi.Queue ) )
-							   .ToList();
+				.Where( x => x.Actor.Owner == self.Owner
+				    && x.Actor.Info.Traits.Get<ProductionInfo>().Produces.Contains( bi.Queue ) )
+					.ToList();
 			var producer = producers.Where( x => x.Actor.IsPrimaryBuilding() ).Concat( producers )
 				.FirstOrDefault();
 
 			if( producer.Actor != null )
-				producer.Actor.TraitsImplementing<RenderSimple>().First().PlayCustomAnim( producer.Actor, "build" );
+				producer.Actor.Trait<RenderSimple>().PlayCustomAnim( producer.Actor, "build" );
 		}
 
 		static int GetNumBuildables(Player p)
diff --git a/OpenRA.Mods.RA/Player/ProductionQueue.cs b/OpenRA.Mods.RA/Player/ProductionQueue.cs
index a1738d989c..312459591a 100755
--- a/OpenRA.Mods.RA/Player/ProductionQueue.cs
+++ b/OpenRA.Mods.RA/Player/ProductionQueue.cs
@@ -288,7 +288,7 @@ namespace OpenRA.Mods.RA
 				return true;
 			}
 			
-			var sp = self.TraitsImplementing<Production>().Where(p => p.Info.Produces.Contains(Info.Type)).FirstOrDefault();
+			var sp = self.TraitsImplementing<Production>().FirstOrDefault(p => p.Info.Produces.Contains(Info.Type));
 			if (sp != null && !IsDisabledBuilding(self) && sp.Produce(self, Rules.Info[ name ]))
 			{
 				FinishProduction();