Core/Battleground: allow Random battleground and arena queues same time.

Port From (https://github.com/TrinityCore/TrinityCore/commit/a9e7464e0d1f201b4a84d7fd955018e3a2c2cc59)
2021-09-26 11:44:23 -04:00
parent ba423331de
commit aac3003bc2
3 changed files with 4 additions and 4 deletions
@@ -536,10 +536,10 @@ namespace Game.Entities
            return Global.BattlegroundMgr.GetBattleground(GetBattlegroundId(), m_bgData.bgTypeID);
        }

-        public bool InBattlegroundQueue()
+        public bool InBattlegroundQueue(bool ignoreArena = false)
        {
            for (byte i = 0; i < SharedConst.MaxPlayerBGQueues; ++i)
-                if (m_bgBattlegroundQueueID[i].bgQueueTypeId != default)
+                if (m_bgBattlegroundQueueID[i].bgQueueTypeId != default && (!ignoreArena || m_bgBattlegroundQueueID[i].bgQueueTypeId.BattlemasterListId != (ushort)BattlegroundTypeId.AA))
                    return true;
            return false;
        }