nchebrov/mod-player-bot-level-brackets
1
0
Fork 0
mirror of https://github.com/kadeshar/mod-player-bot-level-brackets.git synced 2026-02-07 04:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43 from DustinHendrickson/Dustin/ExtraSafetyChecks

Browse Source 
Dustin/extra safety checks
This commit is contained in:
Dustin Hendrickson
2025-05-26 17:56:43 -07:00
committed by GitHub
parent d7b1618cc0 cc9eec8a60
commit fc207e1f9c
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/mod-player-bot-level-brackets.cpp
View File

@@ -554,17 +554,26 @@ static void ProcessPendingLevelResets()
break; break;
Player* bot = it->bot; Player* bot = it->bot;
if (!bot || !bot->IsInWorld())
{
it = g_PendingLevelResets.erase(it);
continue;
}
int targetRange = it->targetRange; int targetRange = it->targetRange;
if (g_IgnoreGuildBotsWithRealPlayers && BotInGuildWithRealPlayer(bot)) if (g_IgnoreGuildBotsWithRealPlayers && BotInGuildWithRealPlayer(bot))
{ {
it = g_PendingLevelResets.erase(it); it = g_PendingLevelResets.erase(it);
continue; continue;
} }
if (g_IgnoreFriendListed && BotInFriendList(bot)) if (g_IgnoreFriendListed && BotInFriendList(bot))
{ {
it = g_PendingLevelResets.erase(it); it = g_PendingLevelResets.erase(it);
continue; continue;
} }
if (bot && bot->IsInWorld() && IsBotSafeForLevelReset(bot)) if (bot && bot->IsInWorld() && IsBotSafeForLevelReset(bot))
{ {
AdjustBotToRange(bot, targetRange, it->factionRanges); AdjustBotToRange(bot, targetRange, it->factionRanges);
@@ -967,7 +976,11 @@ public:
while (allianceActualCounts[i] > allianceDesiredCounts[i] && !safeBots.empty()) while (allianceActualCounts[i] > allianceDesiredCounts[i] && !safeBots.empty())
{ {
Player* bot = safeBots.back(); Player* bot = safeBots.back();
safeBots.pop_back(); if (!bot || !bot->IsInWorld())
{
safeBots.pop_back();
continue;
}
if (g_BotDistFullDebugMode) if (g_BotDistFullDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Alliance safe bot '{}' from range {} will be moved.", bot->GetName(), i + 1); LOG_INFO("server.loading", "[BotLevelBrackets] Alliance safe bot '{}' from range {} will be moved.", bot->GetName(), i + 1);
@@ -1032,7 +1045,11 @@ public:
while (allianceActualCounts[i] > allianceDesiredCounts[i] && !flaggedBots.empty()) while (allianceActualCounts[i] > allianceDesiredCounts[i] && !flaggedBots.empty())
{ {
Player* bot = flaggedBots.back(); Player* bot = flaggedBots.back();
flaggedBots.pop_back(); if (!bot || !bot->IsInWorld())
{
flaggedBots.pop_back();
continue;
}
if (g_BotDistFullDebugMode) if (g_BotDistFullDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Alliance flagged bot '{}' from range {} will be processed for pending reset.", bot->GetName(), i + 1); LOG_INFO("server.loading", "[BotLevelBrackets] Alliance flagged bot '{}' from range {} will be processed for pending reset.", bot->GetName(), i + 1);
@@ -1135,7 +1152,11 @@ public:
while (hordeActualCounts[i] > hordeDesiredCounts[i] && !safeBots.empty()) while (hordeActualCounts[i] > hordeDesiredCounts[i] && !safeBots.empty())
{ {
Player* bot = safeBots.back(); Player* bot = safeBots.back();
safeBots.pop_back(); if (!bot || !bot->IsInWorld())
{
safeBots.pop_back();
continue;
}
if (g_BotDistFullDebugMode) if (g_BotDistFullDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Horde safe bot '{}' from range {} will be moved.", bot->GetName(), i + 1); LOG_INFO("server.loading", "[BotLevelBrackets] Horde safe bot '{}' from range {} will be moved.", bot->GetName(), i + 1);
@@ -1200,7 +1221,11 @@ public:
while (hordeActualCounts[i] > hordeDesiredCounts[i] && !flaggedBots.empty()) while (hordeActualCounts[i] > hordeDesiredCounts[i] && !flaggedBots.empty())
{ {
Player* bot = flaggedBots.back(); Player* bot = flaggedBots.back();
flaggedBots.pop_back(); if (!bot || !bot->IsInWorld())
{
flaggedBots.pop_back();
continue;
}
if (g_BotDistFullDebugMode) if (g_BotDistFullDebugMode)
{ {
LOG_INFO("server.loading", "[BotLevelBrackets] Horde flagged bot '{}' from range {} will be processed for pending reset.", bot->GetName(), i + 1); LOG_INFO("server.loading", "[BotLevelBrackets] Horde flagged bot '{}' from range {} will be processed for pending reset.", bot->GetName(), i + 1);