From d2dd5de351cb963dab964ef5dfaf11d5f85ff882 Mon Sep 17 00:00:00 2001 From: blinkysc <37940565+blinkysc@users.noreply.github.com> Date: Thu, 26 Mar 2026 19:27:28 -0500 Subject: [PATCH] fix(Core/Movement): Pass waypoint point ID to MovementInform (#25252) Co-authored-by: blinkysc Co-authored-by: Rorschach91 <108557877+Rorschach91@users.noreply.github.com> --- .../MovementGenerators/WaypointMovementGenerator.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp index 05c83a6ff..926a090ae 100644 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp @@ -172,21 +172,21 @@ void WaypointMovementGenerator::ProcessWaypointArrival(Creature* creat // Inform AI if (CreatureAI* AI = creature->AI()) { - AI->MovementInform(WAYPOINT_MOTION_TYPE, i_currentNode); + AI->MovementInform(WAYPOINT_MOTION_TYPE, waypoint.Id); AI->WaypointReached(waypoint.Id, i_path->Id); } if (Unit* owner = creature->GetCharmerOrOwner()) { if (UnitAI* AI = owner->GetAI()) - AI->SummonMovementInform(creature, WAYPOINT_MOTION_TYPE, i_currentNode); + AI->SummonMovementInform(creature, WAYPOINT_MOTION_TYPE, waypoint.Id); } else { if (TempSummon* tempSummon = creature->ToTempSummon()) if (Unit* owner2 = tempSummon->GetSummonerUnit()) if (UnitAI* AI = owner2->GetAI()) - AI->SummonMovementInform(creature, WAYPOINT_MOTION_TYPE, i_currentNode); + AI->SummonMovementInform(creature, WAYPOINT_MOTION_TYPE, waypoint.Id); } // All hooks called and infos updated. Time to increment the waypoint node id @@ -391,7 +391,7 @@ bool WaypointMovementGenerator::DoUpdate(Creature* creature, uint32 di if (CreatureAI* AI = creature->AI()) { - AI->MovementInform(WAYPOINT_MOTION_TYPE, i_currentNode); + AI->MovementInform(WAYPOINT_MOTION_TYPE, passedWp.Id); AI->WaypointReached(passedWp.Id, i_path->Id); }