Merge pull request #12924 from reaperrr/fix-tunnel-atk

Prevent units in tunnels/underground from attacking
2017-04-29 00:25:23 -05:00
parent 60bc114e39 1fae993593
commit 4917c6e453
1 changed files with 4 additions and 0 deletions
--- a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
+++ b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
@@ -80,6 +80,10 @@ namespace OpenRA.Mods.Common.Traits
 			if (!HasAnyValidWeapons(target))
 				return false;

+			var mobile = self.TraitOrDefault<Mobile>();
+			if (mobile != null && !mobile.CanInteractWithGroundLayer(self))
+				return false;
+
 			// Building is under construction or is being sold
 			if (building.Value != null && !building.Value.BuildComplete)
 				return false;