forked from liza/Questionable
Handle zone transitiions in new movement logic
This commit is contained in:
parent
24c1e0c5d9
commit
47d9f090a2
@ -1,5 +1,5 @@
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<Version>2.18</Version>
|
||||
<Version>2.19</Version>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
@ -169,6 +169,8 @@ internal static class MoveTo
|
||||
private readonly Action _startAction;
|
||||
private readonly Vector3 _destination;
|
||||
private readonly MoveParams _moveParams;
|
||||
private readonly bool _isUnderwaterInitially;
|
||||
private bool _canRestart;
|
||||
|
||||
public MoveInternal(MoveParams moveParams,
|
||||
MovementController movementController,
|
||||
@ -213,6 +215,7 @@ internal static class MoveTo
|
||||
}
|
||||
|
||||
_moveParams = moveParams;
|
||||
_canRestart = moveParams.RestartNavigation;
|
||||
}
|
||||
|
||||
public bool Start()
|
||||
@ -231,13 +234,20 @@ internal static class MoveTo
|
||||
if (movementStartedAt == DateTime.MaxValue || movementStartedAt.AddSeconds(2) >= DateTime.Now)
|
||||
return ETaskResult.StillRunning;
|
||||
|
||||
if (_moveParams.RestartNavigation &&
|
||||
if (_canRestart &&
|
||||
Vector3.Distance(_clientState.LocalPlayer!.Position, _destination) >
|
||||
(_moveParams.StopDistance ?? QuestStep.DefaultStopDistance) + 5f)
|
||||
{
|
||||
_logger.LogInformation("Looks like movement was interrupted, re-attempting to move");
|
||||
_startAction();
|
||||
return ETaskResult.StillRunning;
|
||||
_canRestart = false;
|
||||
if (_clientState.TerritoryType == _moveParams.TerritoryId)
|
||||
{
|
||||
_logger.LogInformation("Looks like movement was interrupted, re-attempting to move");
|
||||
_startAction();
|
||||
return ETaskResult.StillRunning;
|
||||
}
|
||||
else
|
||||
_logger.LogInformation(
|
||||
"Looks like movement was interrupted, do nothing since we're in a different territory now");
|
||||
}
|
||||
|
||||
return ETaskResult.TaskComplete;
|
||||
|
Loading…
Reference in New Issue
Block a user