Adding in world check

This commit is contained in:
Dustin Hendrickson
2025-12-11 10:06:18 -06:00
parent 1faa24cf15
commit 6a33cb3257

View File

@@ -1057,6 +1057,26 @@ static void ProcessPendingLevelResets()
continue; continue;
} }
// Check if bot is now in a group with real players
if (Group* group = bot->GetGroup())
{
bool hasRealPlayer = false;
for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
{
Player* member = ref->GetSource();
if (member && member->IsInWorld() && !IsPlayerBot(member))
{
hasRealPlayer = true;
break;
}
}
if (hasRealPlayer)
{
it = g_PendingLevelResets.erase(it);
continue;
}
}
if (bot && bot->IsInWorld() && IsBotSafeForLevelReset(bot)) if (bot && bot->IsInWorld() && IsBotSafeForLevelReset(bot))
{ {
AdjustBotToRange(bot, targetRange, it->factionRanges); AdjustBotToRange(bot, targetRange, it->factionRanges);
@@ -1110,7 +1130,7 @@ static int GetOrFlagPlayerBracket(Player* player)
for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next()) for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
{ {
Player* member = ref->GetSource(); Player* member = ref->GetSource();
if (member && !IsPlayerBot(member)) if (member && member->IsInWorld() && !IsPlayerBot(member))
{ {
if (g_BotDistFullDebugMode) if (g_BotDistFullDebugMode)
{ {