Core/Battlegrounds: Store mercenary status separately from the aura obtained from gossip as it can be removed at any time

Port From (https://github.com/TrinityCore/TrinityCore/commit/84486ded67efc4e779412ff865c66ca8b9cee7ea)
2022-05-31 12:07:04 -04:00
parent 5d315fd84d
commit 036c565f69
10 changed files with 83 additions and 54 deletions
@@ -3524,17 +3524,6 @@ namespace Game.Entities
                m_team = (m_team == Team.Alliance) ? Team.Horde : Team.Alliance;
        }

-        public Team GetBgQueueTeam()
-        {
-            if (HasAura(PlayerConst.SpellMercenaryContractHorde))
-                return Team.Horde;
-
-            if (HasAura(PlayerConst.SpellMercenaryContractAlliance))
-                return Team.Alliance;
-
-            return GetTeam();
-        }
-
        public Team GetNativeTeam() { return TeamForRace(GetRace()); }
        public uint GetNativeTeamId() { return TeamIdForRace(GetRace()); }