From 0cfae2673ffb9eb3871349b694b942464e32cbd7 Mon Sep 17 00:00:00 2001
From: Yunfan Li <lyf_liyunfan@sina.com>
Date: Tue, 10 Dec 2024 20:22:52 +0800
Subject: [PATCH] [Crash fix] Fix race condition on BattlegroundData

---
 src/RandomPlayerbotMgr.cpp | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/RandomPlayerbotMgr.cpp b/src/RandomPlayerbotMgr.cpp
index cbb4e53e..0d583332 100644
--- a/src/RandomPlayerbotMgr.cpp
+++ b/src/RandomPlayerbotMgr.cpp
@@ -165,6 +165,13 @@ RandomPlayerbotMgr::RandomPlayerbotMgr() : PlayerbotHolder(), processTicks(0)
     }
 
     BattlegroundData.clear();
+    for (int bracket = BG_BRACKET_ID_FIRST; bracket < MAX_BATTLEGROUND_BRACKETS; ++bracket)
+    {
+        for (int queueType = BATTLEGROUND_QUEUE_AV; queueType < MAX_BATTLEGROUND_QUEUE_TYPES; ++queueType)
+        {
+            BattlegroundData[queueType][bracket] = BattlegroundInfo();
+        }
+    }
     BgCheckTimer = 0;
     LfgCheckTimer = 0;
     PlayersCheckTimer = 0;
@@ -341,19 +348,19 @@ void RandomPlayerbotMgr::UpdateAIInternal(uint32 elapsed, bool /*minimal*/)
     if (sPlayerbotAIConfig->syncLevelWithPlayers && !players.empty())
     {
         if (time(nullptr) > (PlayersCheckTimer + 60))
-            activateCheckPlayersThread();
+            sRandomPlayerbotMgr->CheckPlayers();
     }
 
     if (sPlayerbotAIConfig->randomBotJoinBG /* && !players.empty()*/)
     {
         if (time(nullptr) > (BgCheckTimer + 30))
-            activateCheckBgQueueThread();
+            sRandomPlayerbotMgr->CheckBgQueue();
     }
 
     if (sPlayerbotAIConfig->randomBotJoinLfg /* && !players.empty()*/)
     {
         if (time(nullptr) > (LfgCheckTimer + 30))
-            activateCheckLfgQueueThread();
+            sRandomPlayerbotMgr->CheckLfgQueue();
     }
 
     uint32 updateBots = sPlayerbotAIConfig->randomBotsPerInterval * onlineBotFocus / 100;
@@ -594,6 +601,14 @@ void RandomPlayerbotMgr::CheckBgQueue()
 
     BattlegroundData.clear();
 
+    for (int bracket = BG_BRACKET_ID_FIRST; bracket < MAX_BATTLEGROUND_BRACKETS; ++bracket)
+    {
+        for (int queueType = BATTLEGROUND_QUEUE_AV; queueType < MAX_BATTLEGROUND_QUEUE_TYPES; ++queueType)
+        {
+            BattlegroundData[queueType][bracket] = BattlegroundInfo();
+        }
+    }
+
     for (Player* player : players)
     {
         if (!player->InBattlegroundQueue())
@@ -840,7 +855,8 @@ void RandomPlayerbotMgr::LogBattlegroundInfo()
             for (const auto& bracketIdPair : queueTypePair.second)
             {
                 auto& bgInfo = bracketIdPair.second;
-
+                if (bgInfo.minLevel == 0)
+                    continue;
                 LOG_INFO("playerbots",
                          "ARENA:{} {}: Player (Skirmish:{}, Rated:{}) Bots (Skirmish:{}, Rated:{}) Total (Skirmish:{} "
                          "Rated:{}), Instances (Skirmish:{} Rated:{})",
@@ -889,6 +905,8 @@ void RandomPlayerbotMgr::LogBattlegroundInfo()
         for (const auto& bracketIdPair : queueTypePair.second)
         {
             auto& bgInfo = bracketIdPair.second;
+            if (bgInfo.minLevel == 0)
+                continue;
 
             LOG_INFO("playerbots", "BG:{} {}: Player ({}:{}) Bot ({}:{}) Total (A:{} H:{}), Instances {}", _bgType,
                      std::to_string(bgInfo.minLevel) + "-" + std::to_string(bgInfo.maxLevel),