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

Merge pull request #10707 from RoosterDragon/mobile-fix

Browse Source 
Fix mobile checks
This commit is contained in:
Oliver Brakmann
2016-02-07 14:29:19 +01:00
parent d5b37edccb 7fe42d7493
commit ce0e092432
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -232,6 +232,12 @@ namespace OpenRA.Mods.Common.Traits
if (otherActor == ignoreActor) if (otherActor == ignoreActor)
return false; return false;
// If self is null, we don't have a real actor - we're just checking what would happen theoretically.
// In such a scenario - we'll just assume any other actor in the cell will block us by default.
// If we have a real actor, we can then perform the extra checks that allow us to avoid being blocked.
if (self == null)
return true;
// If the check allows: we are not blocked by allied units moving in our direction. // If the check allows: we are not blocked by allied units moving in our direction.
if (!check.HasCellCondition(CellConditions.BlockedByMovers) && if (!check.HasCellCondition(CellConditions.BlockedByMovers) &&
self.Owner.Stances[otherActor.Owner] == Stance.Ally && self.Owner.Stances[otherActor.Owner] == Stance.Ally &&