Compare commits

...

3 Commits

View File

@ -209,33 +209,29 @@ public:
void OnPlayerGiveXP(Player* player, uint32& amount, Unit* /*victim*/, uint8 /*xpSource*/) override void OnPlayerGiveXP(Player* player, uint32& amount, Unit* /*victim*/, uint8 /*xpSource*/) override
{ {
// when default no XP scaling. // early return
if (sPlayerbotAIConfig->randomBotXPRate == 1.0) if (sPlayerbotAIConfig->randomBotXPRate == 1.0 || !player)
return; return;
// when player is no bot. // no XP multiplier, when player is no bot.
if (!player->GetSession()->IsBot()) if (!player->GetSession()->IsBot() || !sRandomPlayerbotMgr->IsRandomBot(player))
return; return;
// when player is no bot, double check. // no XP multiplier, when bot has group where leader is a real player.
if (!sRandomPlayerbotMgr->IsRandomBot(player))
return;
// when bot has group where leader is a real player.
if (Group* group = player->GetGroup()) if (Group* group = player->GetGroup())
{ {
Player* leader = group->GetLeader(); Player* leader = group->GetLeader();
if (leader != player) if (leader && leader != player)
{ {
if (!leader->GetSession()->IsBot()) if (PlayerbotAI* leaderBotAI = GET_PLAYERBOT_AI(leader))
return; {
if (leaderBotAI->HasRealPlayerMaster())
if (!sRandomPlayerbotMgr->IsRandomBot(leader))
return; return;
} }
} }
}
// otherwise apply bot XP scaling. // otherwise apply bot XP multiplier.
amount = static_cast<uint32>(std::round(static_cast<float>(amount) * sPlayerbotAIConfig->randomBotXPRate)); amount = static_cast<uint32>(std::round(static_cast<float>(amount) * sPlayerbotAIConfig->randomBotXPRate));
} }
}; };