Merge branch '4.x' of github.com:TrinityCore/TrinityCore into 4.x

1 files changed, 3 insertions, 1 deletions

diff --git a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp
index cf335ec1971..6357612607f 100644
--- a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp
+++ b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp
@@ -154,14 +154,16 @@ void ArenaTeamMgr::DistributeArenaPoints()
     SQLTransaction trans = CharacterDatabase.BeginTransaction();
 
     // Cycle that gives points to all players
+	/*
     for (std::map<uint32, uint32>::iterator playerItr = PlayerPoints.begin(); playerItr != PlayerPoints.end(); ++playerItr)
     {
         // Add points to player if online
         if (Player* player = HashMapHolder<Player>::Find(playerItr->first))
-            player->ModifyArenaPoints(playerItr->second, &trans);
+            player->ModifyConquestPoints(playerItr->second, &trans);
         else    // Update database
             trans->PAppend("UPDATE characters SET arenaPoints=arenaPoints+%u WHERE guid=%u", playerItr->second, playerItr->first);
     }
+	*/
 
     CharacterDatabase.CommitTransaction(trans);