Skip to content

Commit

Permalink
Plaerbot BG Queue fixes (#130)
Browse files Browse the repository at this point in the history
Need to fix up the queue so that we pass around a guid that we look up
otherwise it is possible to crash on message processing with an invalid
pointer (for example, if the playerbot disappears due to logout).
  • Loading branch information
botnomicon authored Jan 25, 2025
1 parent 6ecfbc7 commit 8757e7d
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions playerbot/RandomPlayerbotMgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1213,12 +1213,16 @@ void RandomPlayerbotMgr::CheckBgQueue()
#ifdef MANGOSBOT_ONE
if (ArenaType arenaType = sServerFacade.BgArenaType(queueTypeId))
{
sWorld.GetBGQueue().GetMessager().AddMessage([queueTypeId, player = player, arenaType = arenaType, bracketId = bracketId, tempT = TeamId](BattleGroundQueue* bgQueue)
sWorld.GetBGQueue().GetMessager().AddMessage([queueTypeId, playerId = player->GetObjectGuid(), arenaType = arenaType, bracketId = bracketId, tempT = TeamId](BattleGroundQueue* bgQueue)
{
uint32 TeamId;
GroupQueueInfo ginfo;

BattleGroundQueueItem* queueItem = &bgQueue->GetBattleGroundQueue(queueTypeId);
Player *player = RandomPlayerbotMgr::instance().GetPlayer(playerId);

if (!player)
return;

if (queueItem->GetPlayerGroupInfoData(player->GetObjectGuid(), &ginfo))
{
Expand Down Expand Up @@ -1339,12 +1343,15 @@ void RandomPlayerbotMgr::CheckBgQueue()
ArenaType arenaType = sServerFacade.BgArenaType(queueTypeId);
if (arenaType != ARENA_TYPE_NONE)
{
sWorld.GetBGQueue().GetMessager().AddMessage([queueTypeId, bot = bot, arenaType = arenaType, bracketId = bracketId, tempT = TeamId](BattleGroundQueue* bgQueue)
sWorld.GetBGQueue().GetMessager().AddMessage([queueTypeId, botId = bot->GetObjectGuid(), arenaType = arenaType, bracketId = bracketId, tempT = TeamId](BattleGroundQueue* bgQueue)
{
uint32 TeamId;
GroupQueueInfo ginfo;

BattleGroundQueueItem* queueItem = &bgQueue->GetBattleGroundQueue(queueTypeId);
Player *bot = RandomPlayerbotMgr::instance().GetPlayer(botId);
if (!bot)
return;

if (queueItem->GetPlayerGroupInfoData(bot->GetObjectGuid(), &ginfo))
{
Expand Down

0 comments on commit 8757e7d

Please sign in to comment.