From 6ab32d75bf962871f24d7b19918109fd4d4d45e3 Mon Sep 17 00:00:00 2001
From: atlimit8 <atlimit8-vcs@gmx.com>
Date: Tue, 8 Sep 2015 23:36:05 -0500
Subject: [PATCH] Make AttackBase.GetMinimumRange() return WDist.Zero if there
 are no available armaments

---
 OpenRA.Mods.Common/Traits/Attack/AttackBase.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
index 7930675bfc..35f9933bf9 100644
--- a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
+++ b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
@@ -167,8 +167,10 @@ namespace OpenRA.Mods.Common.Traits
 			if (IsTraitDisabled)
 				return WDist.Zero;
 
-			return Armaments.Where(a => !a.IsTraitDisabled)
-				.Select(a => a.Weapon.MinRange).Min();
+			var min = Armaments.Where(a => !a.IsTraitDisabled)
+				.Select(a => a.Weapon.MinRange)
+				.Append(WDist.MaxValue).Min();
+			return min != WDist.MaxValue ? min : WDist.Zero;
 		}
 
 		public WDist GetMaximumRange()