Merge pull request OpenRA#6905 from LipkeGu/Dont_query_traits_on_dead…

…_units AnyUnitsAt: Ignore Units which are Destroyed
GGGK · Nov 11, 2014 · 5510001 · 5510001
2 parents 08f5081 + ae4ee09
commit 5510001
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/OpenRA.Game/Traits/World/ActorMap.cs b/OpenRA.Game/Traits/World/ActorMap.cs
@@ -281,9 +281,8 @@ public bool AnyUnitsAt(CPos a, SubCell sub, Func<Actor, bool> withCondition)
 
 			var always = sub == SubCell.FullCell || sub == SubCell.Any;
 			for (var i = influence[a]; i != null; i = i.Next)
-				if (always || i.SubCell == sub || i.SubCell == SubCell.FullCell)
-					if (withCondition(i.Actor))
-						return true;
+				if ((always || i.SubCell == sub || i.SubCell == SubCell.FullCell) && !i.Actor.Destroyed && withCondition(i.Actor))
+					return true;
 
 			return false;
 		}