From dd5e229886e1b02f09746c14da93faef89e7b8ff Mon Sep 17 00:00:00 2001
From: abcdefg30 <alphabet@streber24.de>
Date: Fri, 24 Jun 2016 15:30:57 +0200
Subject: [PATCH] Fix a crash with not space occupying actors granting support
 powers

---
 .../Traits/SupportPowers/SupportPowerManager.cs          | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs
index e6ea859e95..b9336983ea 100644
--- a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs
+++ b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs
@@ -236,7 +236,14 @@ namespace OpenRA.Mods.Common.Traits
 				return;
 
 			var power = Instances.Where(i => !InstanceDisabled(i))
-				.MinByOrDefault(a => (a.Self.CenterPosition - a.Self.World.Map.CenterOfCell(order.TargetLocation)).HorizontalLengthSquared);
+				.MinByOrDefault(a =>
+				{
+					if (a.Self.OccupiesSpace == null)
+						return 0;
+
+					return (a.Self.CenterPosition - a.Self.World.Map.CenterOfCell(order.TargetLocation)).HorizontalLengthSquared;
+				});
+
 			if (power == null)
 				return;