aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Battlegrounds/BattlegroundQueue.cpp
diff options
context:
space:
mode:
authorTraesh <traesh@farahlon.com>2022-04-14 23:31:16 +0200
committerShauren <shauren.trinity@gmail.com>2022-04-16 12:15:37 +0200
commit87723e32e24f03ac1d062e33edcbe935e4e59421 (patch)
tree9c7c655929ee19dd827c6ee48eee6c7438592e6e /src/server/game/Battlegrounds/BattlegroundQueue.cpp
parentc4ef231e2a25234099391f574942f6490d400f15 (diff)
Core/Battlegrounds: Implement mercenary system
Diffstat (limited to 'src/server/game/Battlegrounds/BattlegroundQueue.cpp')
-rw-r--r--src/server/game/Battlegrounds/BattlegroundQueue.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp
index 9832628fe04..10b10f805ee 100644
--- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp
+++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp
@@ -140,7 +140,7 @@ GroupQueueInfo* BattlegroundQueue::AddGroup(Player* leader, Group* grp, PVPDiffi
ginfo->IsInvitedToBGInstanceGUID = 0;
ginfo->JoinTime = GameTime::GetGameTimeMS();
ginfo->RemoveInviteTime = 0;
- ginfo->Team = leader->GetTeam();
+ ginfo->Team = leader->GetBgQueueTeam();
ginfo->ArenaTeamRating = ArenaRating;
ginfo->ArenaMatchmakerRating = MatchmakerRating;
ginfo->OpponentsTeamRating = 0;
@@ -179,6 +179,14 @@ GroupQueueInfo* BattlegroundQueue::AddGroup(Player* leader, Group* grp, PVPDiffi
pl_info.GroupInfo = ginfo;
// add the pinfo to ginfo's list
ginfo->Players[member->GetGUID()] = &pl_info;
+
+ if (ginfo->Team != member->GetTeam())
+ {
+ if (member->GetTeam() == ALLIANCE)
+ member->CastSpell(member, SPELL_MERCENARY_CONTRACT_HORDE);
+ else
+ member->CastSpell(member, SPELL_MERCENARY_CONTRACT_ALLIANCE);
+ }
}
}
else