3 files changed, 55 insertions, 52 deletions

diff --git a/src/server/game/Battlegrounds/ArenaScore.h b/src/server/game/Battlegrounds/ArenaScore.h
index 7b25427c078..3b976a0a0da 100644
--- a/src/server/game/Battlegrounds/ArenaScore.h
+++ b/src/server/game/Battlegrounds/ArenaScore.h
@@ -54,40 +54,4 @@ struct ArenaScore : public BattlegroundScore
         uint8 TeamId; // TEAM_ALLIANCE or TEAM_HORDE
 };
 
-struct ArenaTeamScore
-{
-    friend class Battleground;
-
-    protected:
-        ArenaTeamScore() : RatingChange(0), MatchmakerRating(0) { }
-
-        virtual ~ArenaTeamScore() { }
-
-        void Assign(int32 ratingChange, uint32 matchMakerRating, std::string const& teamName)
-        {
-            RatingChange = ratingChange;
-            MatchmakerRating = matchMakerRating;
-            TeamName = teamName;
-        }
-
-        void BuildRatingInfoBlock(WorldPacket& data)
-        {
-            uint32 ratingLost = std::abs(std::min(RatingChange, 0));
-            uint32 ratingWon = std::max(RatingChange, 0);
-
-            data << uint32(ratingLost);
-            data << uint32(ratingWon);
-            data << uint32(MatchmakerRating);
-        }
-
-        void BuildTeamInfoBlock(WorldPacket& data)
-        {
-            data << TeamName;
-        }
-
-        int32 RatingChange;
-        uint32 MatchmakerRating;
-        std::string TeamName;
-};
-
 #endif // TRINITY_ARENA_SCORE_H
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
index fd3e13cf583..d840c351d11 100644
--- a/src/server/game/Battlegrounds/Battleground.cpp
+++ b/src/server/game/Battlegrounds/Battleground.cpp
@@ -170,10 +170,6 @@ Battleground::Battleground()
     m_ArenaTeamMMR[TEAM_ALLIANCE]   = 0;
     m_ArenaTeamMMR[TEAM_HORDE]      = 0;
 
-    // Iterate this way for consistency's sake - client expects it to be sent in this order
-    for (int8 i = WINNER_ALLIANCE; i >= WINNER_HORDE; --i)
-        _arenaTeamScores[i] = new ArenaTeamScore();
-
     m_BgRaids[TEAM_ALLIANCE]         = NULL;
     m_BgRaids[TEAM_HORDE]            = NULL;
 
@@ -225,10 +221,6 @@ Battleground::~Battleground()
 
     for (BattlegroundScoreMap::const_iterator itr = PlayerScores.begin(); itr != PlayerScores.end(); ++itr)
         delete itr->second;
-
-    // Iterate this way for consistency's sake - client expects it to be sent in this order
-    for (int8 i = WINNER_ALLIANCE; i >= WINNER_HORDE; --i)
-        delete _arenaTeamScores[i];
 }
 
 void Battleground::Update(uint32 diff)
@@ -795,8 +787,8 @@ void Battleground::EndBattleground(uint32 winner)
                 uint8 winnerId = GetWinner();
                 uint8 loserId = winnerId == WINNER_ALLIANCE ? uint8(WINNER_HORDE) : winnerId;
 
-                _arenaTeamScores[winnerId]->Assign(winnerChange, winnerMatchmakerRating + winnerMatchmakerChange, winnerArenaTeam->GetName());
-                _arenaTeamScores[loserId]->Assign(loserChange, loserMatchmakerRating + loserMatchmakerChange, loserArenaTeam->GetName());
+                _arenaTeamScores[winnerId].Assign(winnerChange, winnerMatchmakerRating + winnerMatchmakerChange, winnerArenaTeam->GetName());
+                _arenaTeamScores[loserId].Assign(loserChange, loserMatchmakerRating + loserMatchmakerChange, loserArenaTeam->GetName());
 
                 TC_LOG_DEBUG("bg.arena", "Arena match Type: %u for Team1Id: %u - Team2Id: %u ended. WinnerTeamId: %u. Winner rating: +%d, Loser rating: %d", m_ArenaType, m_ArenaTeamIds[TEAM_ALLIANCE], m_ArenaTeamIds[TEAM_HORDE], winnerArenaTeam->GetId(), winnerChange, loserChange);
                 if (sWorld->getBoolConfig(CONFIG_ARENA_LOG_EXTENDED_INFO))
@@ -811,8 +803,8 @@ void Battleground::EndBattleground(uint32 winner)
             // Deduct 16 points from each teams arena-rating if there are no winners after 45+2 minutes
             else
             {
-                _arenaTeamScores[WINNER_ALLIANCE]->Assign(ARENA_TIMELIMIT_POINTS_LOSS, winnerMatchmakerRating + winnerMatchmakerChange, winnerArenaTeam->GetName());
-                _arenaTeamScores[WINNER_HORDE]->Assign(ARENA_TIMELIMIT_POINTS_LOSS, loserMatchmakerRating + loserMatchmakerChange, loserArenaTeam->GetName());
+                _arenaTeamScores[WINNER_ALLIANCE].Assign(ARENA_TIMELIMIT_POINTS_LOSS, winnerMatchmakerRating + winnerMatchmakerChange, winnerArenaTeam->GetName());
+                _arenaTeamScores[WINNER_HORDE].Assign(ARENA_TIMELIMIT_POINTS_LOSS, loserMatchmakerRating + loserMatchmakerChange, loserArenaTeam->GetName());
 
                 winnerArenaTeam->FinishGame(ARENA_TIMELIMIT_POINTS_LOSS);
                 loserArenaTeam->FinishGame(ARENA_TIMELIMIT_POINTS_LOSS);
@@ -1107,6 +1099,9 @@ void Battleground::Reset()
         delete itr->second;
     PlayerScores.clear();
 
+    for (int8 i = WINNER_ALLIANCE; i >= WINNER_HORDE; --i)
+        _arenaTeamScores[i].Reset();
+
     ResetBGSubclass();
 }
 
@@ -1368,10 +1363,10 @@ void Battleground::BuildPvPLogDataPacket(WorldPacket& data)
     {
         // it seems this must be according to BG_WINNER_A/H and _NOT_ TEAM_A/H
         for (int8 i = WINNER_ALLIANCE; i >= WINNER_HORDE; --i)
-            _arenaTeamScores[i]->BuildRatingInfoBlock(data);
+            _arenaTeamScores[i].BuildRatingInfoBlock(data);
 
         for (int8 i = WINNER_ALLIANCE; i >= WINNER_HORDE; --i)
-            _arenaTeamScores[i]->BuildTeamInfoBlock(data);
+            _arenaTeamScores[i].BuildTeamInfoBlock(data);
     }
 
     if (GetStatus() == STATUS_WAIT_LEAVE)
diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h
index 7d1bf550695..e353cd1dc62 100644
--- a/src/server/game/Battlegrounds/Battleground.h
+++ b/src/server/game/Battlegrounds/Battleground.h
@@ -22,6 +22,7 @@
 #include "Common.h"
 #include "SharedDefines.h"
 #include "DBCEnums.h"
+#include "WorldPacket.h"
 
 class Creature;
 class GameObject;
@@ -32,7 +33,6 @@ class WorldObject;
 class WorldPacket;
 class BattlegroundMap;
 
-struct ArenaTeamScore;
 struct BattlegroundScore;
 struct Position;
 struct PvPDifficultyEntry;
@@ -611,7 +611,51 @@ class Battleground
         uint32 m_ArenaTeamIds[BG_TEAMS_COUNT];
 
         uint32 m_ArenaTeamMMR[BG_TEAMS_COUNT];
-        ArenaTeamScore* _arenaTeamScores[BG_TEAMS_COUNT];
+
+        struct ArenaTeamScore
+        {
+            friend class Battleground;
+
+        protected:
+            ArenaTeamScore() : RatingChange(0), MatchmakerRating(0) { }
+
+            virtual ~ArenaTeamScore() { }
+
+            void Assign(int32 ratingChange, uint32 matchMakerRating, std::string const& teamName)
+            {
+                RatingChange = ratingChange;
+                MatchmakerRating = matchMakerRating;
+                TeamName = teamName;
+            }
+
+            void BuildRatingInfoBlock(WorldPacket& data)
+            {
+                uint32 ratingLost = std::abs(std::min(RatingChange, 0));
+                uint32 ratingWon = std::max(RatingChange, 0);
+
+                data << uint32(ratingLost);
+                data << uint32(ratingWon);
+                data << uint32(MatchmakerRating);
+            }
+
+            void BuildTeamInfoBlock(WorldPacket& data)
+            {
+                data << TeamName;
+            }
+
+            void Reset()
+            {
+                RatingChange = 0;
+                MatchmakerRating = 0;
+                TeamName.clear();
+            }
+
+            int32 RatingChange;
+            uint32 MatchmakerRating;
+            std::string TeamName;
+        };
+
+        ArenaTeamScore _arenaTeamScores[BG_TEAMS_COUNT];
 
         // Limits
         uint32 m_LevelMin;