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

Fix: Bots not mounting in BG's anymore (#1056)

Browse Source 
Bots didn't stop as they were supposed to, leading to some issues.
This commit is contained in:
SaW 2025-03-04 13:42:41 +01:00 committed by GitHub
parent 13a4dde643
commit bf22f20997
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/strategy/actions/CheckMountStateAction.cpp
View File

@ -80,7 +80,7 @@ bool CheckMountStateAction::isUseful()
// Not useful when bot does not have mount strat and is not currently mounted // Not useful when bot does not have mount strat and is not currently mounted
if (!GET_PLAYERBOT_AI(bot)->HasStrategy("mount", BOT_STATE_NON_COMBAT) && !bot->IsMounted()) if (!GET_PLAYERBOT_AI(bot)->HasStrategy("mount", BOT_STATE_NON_COMBAT) && !bot->IsMounted())
return false; return false;
// Not useful when level lower than minimum required // Not useful when level lower than minimum required
if (bot->GetLevel() < sPlayerbotAIConfig->useGroundMountAtMinLevel) if (bot->GetLevel() < sPlayerbotAIConfig->useGroundMountAtMinLevel)
@ -144,8 +144,9 @@ bool CheckMountStateAction::Execute(Event /*event*/)
return true; return true;
} }
// If there is a master and bot not in BG
bool inBattleground = bot->InBattleground(); bool inBattleground = bot->InBattleground();
// If there is a master and bot not in BG
if (master && !inBattleground) if (master && !inBattleground)
{ {
Group* group = bot->GetGroup(); Group* group = bot->GetGroup();
@ -305,9 +306,6 @@ bool CheckMountStateAction::TryPreferredMount(Player* master) const
if (index < mounts.size() && sSpellMgr->GetSpellInfo(mounts[index]) && if (index < mounts.size() && sSpellMgr->GetSpellInfo(mounts[index]) &&
botAI->CanCastSpell(mounts[index], bot)) botAI->CanCastSpell(mounts[index], bot))
{ {
if (bot->isMoving())
bot->StopMoving();
botAI->CastSpell(mounts[index], bot); botAI->CastSpell(mounts[index], bot);
return true; return true;
} }
@ -319,6 +317,10 @@ bool CheckMountStateAction::TryPreferredMount(Player* master) const
bool CheckMountStateAction::TryRandomMountFiltered(const std::map<int32, std::vector<uint32>>& spells, int32 masterSpeed) const bool CheckMountStateAction::TryRandomMountFiltered(const std::map<int32, std::vector<uint32>>& spells, int32 masterSpeed) const
{ {
// Required here as otherwise bots won't mount in BG's due to them constant moving
if (bot->isMoving())
bot->StopMoving();
for (const auto& pair : spells) for (const auto& pair : spells)
{ {
int32 currentSpeed = pair.first; int32 currentSpeed = pair.first;
@ -333,9 +335,6 @@ bool CheckMountStateAction::TryRandomMountFiltered(const std::map<int32, std::ve
if (botAI->CanCastSpell(ids[index], bot)) if (botAI->CanCastSpell(ids[index], bot))
{ {
if (bot->isMoving())
bot->StopMoving();
botAI->CastSpell(ids[index], bot); botAI->CastSpell(ids[index], bot);
return true; return true;
} }
@ -370,7 +369,7 @@ bool CheckMountStateAction::ShouldFollowMasterMountState(Player* master, bool no
masterInShapeshiftForm == FORM_FLIGHT_EPIC || masterInShapeshiftForm == FORM_FLIGHT_EPIC ||
masterInShapeshiftForm == FORM_TRAVEL); masterInShapeshiftForm == FORM_TRAVEL);
return isMasterMounted && !bot->IsMounted() && noAttackers && return isMasterMounted && !bot->IsMounted() && noAttackers &&
shouldMount && !bot->IsInCombat() && botAI->GetState() != BOT_STATE_COMBAT; shouldMount && !bot->IsInCombat() && botAI->GetState() != BOT_STATE_COMBAT;
} }
bool CheckMountStateAction::ShouldDismountForMaster(Player* master) const bool CheckMountStateAction::ShouldDismountForMaster(Player* master) const