nchebrov/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots.git synced 2026-02-14 15:53:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'liyunfan1223:master' into locale_fix

Browse Source
This commit is contained in:
Atidote
2024-07-28 10:52:13 +02:00
committed by GitHub
parent eec4776672 7d00fa61d0
commit b8cea4a3a9
9 changed files with 46 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/strategy/actions/MovementActions.cpp
View File

@@ -849,6 +849,21 @@ void MovementAction::UpdateMovementState()
if (bot->IsFlying())
bot->UpdateSpeed(MOVE_FLIGHT, true);
Transport* newTransport = bot->GetMap()->GetTransportForPos(bot->GetPhaseMask(), bot->GetPositionX(), bot->GetPositionY(), bot->GetPositionZ(), bot);
if (newTransport != bot->GetTransport())
{
LOG_DEBUG("playerbots", "Bot {} is on a transport", bot->GetName());
if (bot->GetTransport())
bot->GetTransport()->RemovePassenger(bot, true);
if (newTransport)
newTransport->AddPassenger(bot, true);
bot->StopMovingOnCurrentPos();
}
// Temporary speed increase in group
//if (botAI->HasRealPlayerMaster())
//bot->SetSpeedRate(MOVE_RUN, 1.1f);

2
src/strategy/actions/UseMeetingStoneAction.cpp
View File

@@ -206,7 +206,7 @@ bool SummonAction::Teleport(Player* summoner, Player* player)
return false;
}
bool revive = sPlayerbotAIConfig->reviveBotWhenSummoned == 2 || (sPlayerbotAIConfig->reviveBotWhenSummoned == 1 && !master->IsInCombat());
bool revive = sPlayerbotAIConfig->reviveBotWhenSummoned == 2 || (sPlayerbotAIConfig->reviveBotWhenSummoned == 1 && !master->IsInCombat() && master->IsAlive());
if (bot->isDead() && revive)
{
bot->ResurrectPlayer(1.0f, false);