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

Prevent units in tunnels/underground from attacking
OpenRA · Apr 29, 2017 · 4917c6e · 4917c6e
2 parents 60bc114 + 1fae993
commit 4917c6e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
@@ -80,6 +80,10 @@ protected virtual bool CanAttack(Actor self, Target target)
 			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;