Merge pull request #7522 from delftswa2014/bugfix/sellicon

Closes #7508
2015-03-08 19:13:34 +01:00
parent 78e74eb685 97ca96f8ab
commit 762c0e12a2
1 changed files with 8 additions and 2 deletions
--- a/OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs
+++ b/OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs
@@ -43,8 +43,14 @@ namespace OpenRA.Mods.Common.Orders
 					.FirstOrDefault(a => a.Owner == world.LocalPlayer && a.TraitsImplementing<T>()
 						.Any(Exts.IsTraitEnabled));

-				if (underCursor != null)
-					yield return new Order(order, underCursor, false);
+				if (underCursor == null)
+					yield break;
+
+				var building = underCursor.TraitOrDefault<Building>();
+				if (building != null && building.Locked)
+					yield break;
+
+				yield return new Order(order, underCursor, false);
 			}
 		}