yolinlin/azerothcore-wotlk-pbot
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2025-11-29 17:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Waypoint: Fix last point not being reached on non 0 indexed paths (#23460)

Browse Source
This commit is contained in:
killerwife
2025-10-28 18:56:44 +01:00
committed by GitHub
parent 2bec42c747
commit 4fd7a2a644
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,8 +130,6 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature)
if (m_isArrivalDone)
{
// Xinef: not true... update this at every waypoint!
//if ((i_currentNode == i_path->size() - 1) && !repeating) // If that's our last waypoint
{
auto currentNodeItr = i_path->find(i_currentNode);
float x = currentNodeItr->second.x;
@@ -157,7 +155,8 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature)
}
// Xinef: moved the upper IF here
if ((i_currentNode == i_path->size() - 1) && !repeating) // If that's our last waypoint
uint32 lastPoint = i_path->rbegin()->first;
if ((i_currentNode == lastPoint) && !repeating) // If that's our last waypoint
{
creature->AI()->PathEndReached(path_id);
creature->GetMotionMaster()->Initialize();
@@ -165,7 +164,7 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature)
}
++i_currentNode;
if (i_path->rbegin()->first < i_currentNode)
if (lastPoint < i_currentNode)
i_currentNode = i_path->begin()->first;
}
@@ -260,13 +259,7 @@ bool WaypointMovementGenerator<Creature>::DoUpdate(Creature* creature, uint32 di
}
else
{
bool finished = creature->movespline->Finalized();
// xinef: code to detect pre-empetively if we should start movement to next waypoint
// xinef: do not start pre-empetive movement if current node has delay or we are ending waypoint movement
//if (!finished && !i_path->at(i_currentNode)->delay && ((i_currentNode != i_path->size() - 1) || repeating))
// finished = (creature->movespline->_Spline().length(creature->movespline->_currentSplineIdx() + 1) - creature->movespline->timePassed()) < 200;
if (finished)
if (creature->movespline->Finalized())
{
OnArrived(creature);
return StartMove(creature);