sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(CORE/SAI): Properly Implement START_CLOSEST_WAYPOINT (#22256)

Browse Source 
Co-authored-by: wetbrownsauce <you@example.com>
This commit is contained in:
Vanna White
2025-06-26 05:12:13 -06:00
committed by GitHub
parent 0810fa076a
commit 36c4de6590
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/SmartScripts/SmartScript.cpp
+8 -7
View File
@@ -2511,7 +2511,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
std::back_inserter(waypoints), [](uint32 wp) { return wp != 0; }); std::back_inserter(waypoints), [](uint32 wp) { return wp != 0; });
float distanceToClosest = std::numeric_limits<float>::max(); float distanceToClosest = std::numeric_limits<float>::max();
WayPoint* closestWp = nullptr; uint32 closestWpId = 0;
for (WorldObject* target : targets) for (WorldObject* target : targets)
{ {
@@ -2525,23 +2525,24 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (!path || path->empty()) if (!path || path->empty())
continue; continue;
auto itrWp = path->find(0); //waypoint pointid always starts at 1, never 0!
auto itrWp = path->find(1);
if (itrWp != path->end()) if (itrWp != path->end())
{ {
if (WayPoint* wp = itrWp->second) if (WayPoint* wpData = itrWp->second)
{ {
float distToThisPath = creature->GetDistance(wp->x, wp->y, wp->z); float distToThisPath = creature->GetExactDistSq(wpData->x, wpData->y, wpData->z);
if (distToThisPath < distanceToClosest) if (distToThisPath < distanceToClosest)
{ {
distanceToClosest = distToThisPath; distanceToClosest = distToThisPath;
closestWp = wp; closestWpId = wp;
} }
} }
} }
} }
if (closestWp) if (closestWpId)
CAST_AI(SmartAI, creature->AI())->StartPath(false, closestWp->id, true); CAST_AI(SmartAI, creature->AI())->StartPath(false, closestWpId, true);
} }
} }
} }