From 416713de0c225c34bcebb7e2dfc1ca80c060110f Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 7 Mar 2020 11:30:09 +0000 Subject: [PATCH] Fix infantry switching subcells and blocking eachother while moving. --- OpenRA.Mods.Common/Activities/Move/Move.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/Activities/Move/Move.cs b/OpenRA.Mods.Common/Activities/Move/Move.cs index b2c5387fd5..922f0f64be 100644 --- a/OpenRA.Mods.Common/Activities/Move/Move.cs +++ b/OpenRA.Mods.Common/Activities/Move/Move.cs @@ -305,7 +305,7 @@ namespace OpenRA.Mods.Common.Activities var newCell = path[path.Count - 1]; path.RemoveAt(path.Count - 1); - return Pair.New(newCell, mobile.GetAvailableSubCell(nextCell, SubCell.Any, ignoreActor)); + return Pair.New(newCell, mobile.GetAvailableSubCell(nextCell, mobile.FromSubCell, ignoreActor)); } else if (mobile.IsBlocking) { @@ -316,7 +316,7 @@ namespace OpenRA.Mods.Common.Activities if ((nextCell - newCell).Value.LengthSquared > 2) path.Add(mobile.ToCell); - return Pair.New(newCell.Value, mobile.GetAvailableSubCell(newCell.Value, SubCell.Any, ignoreActor)); + return Pair.New(newCell.Value, mobile.GetAvailableSubCell(newCell.Value, mobile.FromSubCell, ignoreActor)); } } @@ -326,7 +326,7 @@ namespace OpenRA.Mods.Common.Activities hasWaited = false; path.RemoveAt(path.Count - 1); - return Pair.New(nextCell, mobile.GetAvailableSubCell(nextCell, SubCell.Any, ignoreActor)); + return Pair.New(nextCell, mobile.GetAvailableSubCell(nextCell, mobile.FromSubCell, ignoreActor)); } protected override void OnLastRun(Actor self)