epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6905 from LipkeGu/Dont_query_traits_on_dead_units

Browse Source 
AnyUnitsAt: Ignore Units which are Destroyed
This commit is contained in:
Chris Forbes
2014-11-12 08:06:58 +13:00
parent 08f50811b0 ae4ee0926a
commit 551000104d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Traits/World/ActorMap.cs
View File

@@ -281,8 +281,7 @@ namespace OpenRA.Traits
var always = sub == SubCell.FullCell || sub == SubCell.Any; var always = sub == SubCell.FullCell || sub == SubCell.Any;
for (var i = influence[a]; i != null; i = i.Next) for (var i = influence[a]; i != null; i = i.Next)
if (always || i.SubCell == sub || i.SubCell == SubCell.FullCell) if ((always || i.SubCell == sub || i.SubCell == SubCell.FullCell) && !i.Actor.Destroyed && withCondition(i.Actor))
if (withCondition(i.Actor))
return true; return true;
return false; return false;