Merge pull request #343 from Jgoodwin64/stay-bug-fix

Fixed bug in StayActions.cpp
This commit is contained in:
fuzzdeveloper
2024-07-16 11:51:52 +10:00
committed by GitHub

View File

@@ -13,7 +13,6 @@ bool StayActionBase::Stay()
//if (!urand(0, 10)) //if (!urand(0, 10))
//botAI->PlaySound(TEXT_EMOTE_YAWN); //botAI->PlaySound(TEXT_EMOTE_YAWN);
if (bot->GetMotionMaster()->GetCurrentMovementGeneratorType() == FLIGHT_MOTION_TYPE) if (bot->GetMotionMaster()->GetCurrentMovementGeneratorType() == FLIGHT_MOTION_TYPE)
return false; return false;
@@ -26,12 +25,13 @@ bool StayActionBase::Stay()
context->GetValue<time_t>("stay time")->Set(stayTime); context->GetValue<time_t>("stay time")->Set(stayTime);
} }
if (!bot->isMoving()) // Stop the bot from moving immediately when action is called
return false; if (bot->isMoving())
{
bot->StopMoving(); bot->StopMoving();
bot->ClearUnitState(UNIT_STATE_CHASE); bot->ClearUnitState(UNIT_STATE_CHASE);
bot->ClearUnitState(UNIT_STATE_FOLLOW); bot->ClearUnitState(UNIT_STATE_FOLLOW);
}
return true; return true;
} }
@@ -43,7 +43,8 @@ bool StayAction::Execute(Event event)
bool StayAction::isUseful() bool StayAction::isUseful()
{ {
return !AI_VALUE2(bool, "moving", "self target"); // Only useful if the bot is currently moving
return AI_VALUE2(bool, "moving", "self target");
} }
bool SitAction::Execute(Event event) bool SitAction::Execute(Event event)