Fix Arena starting personal rating formula

Original patch by maketheking
closes issue 2013

--HG--
branch : trunk

1 files changed, 7 insertions, 9 deletions

diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp
index eda36f886e5..4224ff6357a 100644
--- a/src/game/ArenaTeam.cpp
+++ b/src/game/ArenaTeam.cpp
@@ -147,18 +147,16 @@ bool ArenaTeam::AddMember(const uint64& PlayerGuid)
     newmember.wins_week         = 0;
     newmember.personal_rating   = 0;
 
-    if (sWorld.getConfig(CONFIG_ARENA_SEASON_ID) >= 6)
+    if (sWorld.getConfig(CONFIG_ARENA_START_PERSONAL_RATING) > 0)
+        newmember.personal_rating = sWorld.getConfig(CONFIG_ARENA_START_PERSONAL_RATING);
+    else
     {
-        if (GetRating() < 1000)
-            newmember.personal_rating = GetRating();
+        if (sWorld.getConfig(CONFIG_ARENA_SEASON_ID) < 6)
+            newmember.personal_rating = 1500;
         else
-            newmember.personal_rating = 1000;
+            if (GetRating() >= 1000)
+                newmember.personal_rating = 1000;
     }
-    else
-        newmember.personal_rating = 1500;
-
-    if (sWorld.getConfig(CONFIG_ARENA_START_PERSONAL_RATING) > 0)
-        newmember.personal_rating = sWorld.getConfig(CONFIG_ARENA_START_PERSONAL_RATING);
 
     m_members.push_back(newmember);