diff --git a/OpenRA.Game/GameRules/WeaponInfo.cs b/OpenRA.Game/GameRules/WeaponInfo.cs index ae67d887e7..37962ee8f4 100644 --- a/OpenRA.Game/GameRules/WeaponInfo.cs +++ b/OpenRA.Game/GameRules/WeaponInfo.cs @@ -172,6 +172,9 @@ namespace OpenRA.GameRules if (target.Type == TargetType.Terrain) { var cell = target.CenterPosition.ToCPos(); + if (!world.Map.IsInMap(cell)) + return false; + if (ValidTargets.Contains("Ground") && world.GetTerrainType(cell) != "Water") return true;