From 006f7b888a0bab40da5abff9b9b37ae235574e88 Mon Sep 17 00:00:00 2001
From: Squiggles211 <rbedross211@gmail.com>
Date: Sun, 13 Jul 2014 14:06:30 -0500
Subject: [PATCH] Restored production queue current item checks

Fixes regression #5948 where you could freely build any building by
canceling the production before deploying by restoring the currentItem
checks in the PlaceBuilding order to ensure that the production is still
valid.
---
 OpenRA.Mods.RA/Player/PlaceBuilding.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenRA.Mods.RA/Player/PlaceBuilding.cs b/OpenRA.Mods.RA/Player/PlaceBuilding.cs
index a2ad8c04fb..341618d553 100644
--- a/OpenRA.Mods.RA/Player/PlaceBuilding.cs
+++ b/OpenRA.Mods.RA/Player/PlaceBuilding.cs
@@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA
 
 					var unit = self.World.Map.Rules.Actors[order.TargetString];
 					var queue = order.TargetActor.TraitsImplementing<ProductionQueue>()
-						.FirstOrDefault(q => q.CanBuild(unit));
+						.FirstOrDefault(q => q.CanBuild(unit) && q.CurrentItem() != null && q.CurrentItem().Item == order.TargetString && q.CurrentItem().RemainingTime == 0);
 
 					if (queue == null)
 						return;