diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2020-09-06 23:36:23 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-02-05 13:57:50 +0100 |
| commit | 706163743d481e092111401752c9cbb056b35e69 (patch) | |
| tree | eca161d19bec27a57de0e7e258019bd40b179149 /src/server/game/Battlegrounds/ArenaTeam.cpp | |
| parent | ca498ffab23e9be7a4ffc6ea6adbfa3c01d5e6f6 (diff) | |
[3.3.5] Scripts/Commands: .arena command conversion (PR #25407)
(cherry picked from commit b63d655e20a0facf14fc77798c52ea67d8551fa7)
Diffstat (limited to 'src/server/game/Battlegrounds/ArenaTeam.cpp')
| -rw-r--r-- | src/server/game/Battlegrounds/ArenaTeam.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp index f85546b1c73..9047f6d777e 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.cpp +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp @@ -46,8 +46,8 @@ ArenaTeam::~ArenaTeam() bool ArenaTeam::Create(ObjectGuid captainGuid, uint8 type, std::string const& teamName, uint32 backgroundColor, uint8 emblemStyle, uint32 emblemColor, uint8 borderStyle, uint32 borderColor) { - // Check if captain is present - if (!ObjectAccessor::FindPlayer(captainGuid)) + // Check if captain exists + if (!sCharacterCache->GetCharacterCacheByGuid(captainGuid)) return false; // Check if arena team name is already taken @@ -615,12 +615,9 @@ void ArenaTeam::FinishGame(int32 mod) // Update team's rank, start with rank 1 and increase until no team with more rating was found Stats.Rank = 1; - ArenaTeamMgr::ArenaTeamContainer::const_iterator i = sArenaTeamMgr->GetArenaTeamMapBegin(); - for (; i != sArenaTeamMgr->GetArenaTeamMapEnd(); ++i) - { - if (i->second->GetType() == Type && i->second->GetStats().Rating > Stats.Rating) + for (auto [teamId, team] : sArenaTeamMgr->GetArenaTeams()) + if (team->GetType() == Type && team->GetStats().Rating > Stats.Rating) ++Stats.Rank; - } } int32 ArenaTeam::WonAgainst(uint32 ownMMRating, uint32 opponentMMRating, int32& ratingChange) |