veitR/mod-playerbots
1
0
Fork 0
mirror of https://github.com/liyunfan1223/mod-playerbots.git synced 2026-06-20 15:39:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Movement): Align Follow IsSafe/bounding-radius + ChaseTo emote clear + IsSitState->IsStandState normalization + MoveNear bounding radius

Browse Source
This commit is contained in:
bash 2026-05-30 23:47:52 +02:00
parent 33aa553b71
commit 50e271c601
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Ai/Base/Actions/MovementActions.cpp
View File

@ -219,7 +219,10 @@ bool MovementAction::MoveNear(WorldObject* target, float distance, MovementPrior
if (!target) if (!target)
return false; return false;
distance += target->GetCombatReach(); // Reference uses bounding radius (collision footprint), not combat
// reach (which is wider for big mobs). Bounding radius lands the bot
// at the requested standoff from the model edge, not arbitrarily far.
distance += target->GetObjectSize();
float followAngle = GetFollowAngle(); float followAngle = GetFollowAngle();
@ -340,7 +343,7 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
float distance = bot->GetExactDist(x, y, z); float distance = bot->GetExactDist(x, y, z);
if (distance > 0.01f) if (distance > 0.01f)
{ {
if (bot->IsSitState()) if (!bot->IsStandState())
bot->SetStandState(UNIT_STAND_STATE_STAND); bot->SetStandState(UNIT_STAND_STATE_STAND);
// if (bot->IsNonMeleeSpellCast(true)) // if (bot->IsNonMeleeSpellCast(true))
@ -368,7 +371,7 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
float distance = bot->GetExactDist(x, y, z); float distance = bot->GetExactDist(x, y, z);
if (distance > 0.01f) if (distance > 0.01f)
{ {
if (bot->IsSitState()) if (!bot->IsStandState())
bot->SetStandState(UNIT_STAND_STATE_STAND); bot->SetStandState(UNIT_STAND_STATE_STAND);
DoMovePoint(bot, x, y, z, generatePath, backwards); DoMovePoint(bot, x, y, z, generatePath, backwards);
@ -1206,11 +1209,23 @@ void MovementAction::UpdateMovementState()
bool MovementAction::Follow(Unit* target, float distance, float angle) bool MovementAction::Follow(Unit* target, float distance, float angle)
{ {
UpdateMovementState();
if (!target) if (!target)
return false; return false;
// Unsafe target (cross-faction / phased / leaving) — fall through to
// a generic MoveTo so the bot at least heads in their direction
// instead of refusing to move.
if (!botAI->IsSafe(target))
return MoveTo(target, distance);
// Subtract the target's hitbox so we end up at the requested
// standoff from its edge, not from its centre.
distance = distance <= target->GetObjectSize()
? 0.0f
: distance - target->GetObjectSize();
UpdateMovementState();
if (!bot->InBattleground() && ServerFacade::instance().IsDistanceLessOrEqualThan(ServerFacade::instance().GetDistance2d(bot, target), if (!bot->InBattleground() && ServerFacade::instance().IsDistanceLessOrEqualThan(ServerFacade::instance().GetDistance2d(bot, target),
sPlayerbotAIConfig.followDistance)) sPlayerbotAIConfig.followDistance))
{ {
@ -1356,7 +1371,7 @@ bool MovementAction::Follow(Unit* target, float distance, float angle)
bot->HandleEmoteCommand(0); bot->HandleEmoteCommand(0);
if (bot->IsSitState()) if (!bot->IsStandState())
bot->SetStandState(UNIT_STAND_STATE_STAND); bot->SetStandState(UNIT_STAND_STATE_STAND);
if (bot->IsNonMeleeSpellCast(true)) if (bot->IsNonMeleeSpellCast(true))
@ -1402,6 +1417,10 @@ bool MovementAction::ChaseTo(WorldObject* obj, float distance)
UpdateMovementState(); UpdateMovementState();
// Drop any looping emote (sit/dance/etc.) before the chase, matching
// the reference pre-dispatch normalization.
bot->ClearEmoteState();
if (!bot->IsStandState()) if (!bot->IsStandState())
bot->SetStandState(UNIT_STAND_STATE_STAND); bot->SetStandState(UNIT_STAND_STATE_STAND);
@ -3424,7 +3443,7 @@ bool MovementAction::BoardTransport(Transport* transport)
// MovePoint without pathfinding (transport is a moving object) // MovePoint without pathfinding (transport is a moving object)
if (MotionMaster* mm = bot->GetMotionMaster()) if (MotionMaster* mm = bot->GetMotionMaster())
{ {
if (bot->IsSitState()) if (!bot->IsStandState())
bot->SetStandState(UNIT_STAND_STATE_STAND); bot->SetStandState(UNIT_STAND_STATE_STAND);
mm->MovePoint(0, destX, destY, destZ, FORCED_MOVEMENT_NONE, 0.0f, 0.0f, false, false); mm->MovePoint(0, destX, destY, destZ, FORCED_MOVEMENT_NONE, 0.0f, 0.0f, false, false);