Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Movement: Fixed pauses on waypoint movement happening at wrong times when FollowPathBackwardsFromEndToStart is set and creature is going from end to start

Browse Source 
(cherry picked from commit c5097114d1)
This commit is contained in:
Shauren
2024-04-18 00:19:33 +02:00
committed by Ovahlord
parent b1c0c0a5ce
commit d5d90d7849
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
View File

@@ -284,10 +284,23 @@ void WaypointMovementGenerator<Creature>::OnArrived(Creature* owner)
ASSERT(_currentNode < GetPath()->Nodes.size(), "WaypointMovementGenerator::OnArrived: tried to reference a node id (%u) which is not included in path (%u)", _currentNode, GetPath()->Id);
WaypointNode const& waypoint = GetPath()->Nodes[_currentNode];
if (waypoint.Delay)
Milliseconds delay = [&]
{
if (!_isReturningToStart)
return Milliseconds(waypoint.Delay);
// when traversing the path backwards, use delays from "next" waypoint to make sure pauses happen between the same points as in forward direction
if (_currentNode > 0)
return Milliseconds(GetPath()->Nodes[_currentNode - 1].Delay);
return 0ms;
}();
if (delay > 0ms)
{
owner->ClearUnitState(UNIT_STATE_ROAMING_MOVE);
_nextMoveTime.Reset(waypoint.Delay);
_nextMoveTime.Reset(delay);
}
if (_waitTimeRangeAtPathEnd && IsFollowingPathBackwardsFromEndToStart()