Merge branch 'master' into MaybeFixResouceBundle

src/de/steamwar/bungeecore/sql/UserElo.java

@@ -105,6 +105,8 @@ public class UserElo {
             return emblemCache.get(user.getId());
         }
 
+        int maxEmblemProgression = 0;
+        int maxEloOfGameMode = 0;
         int maxEloOfPlayer = 0;
         ArenaMode arenaMode = null;
         for (ArenaMode mode : ArenaMode.getAllModes()) {
@@ -112,9 +114,15 @@ public class UserElo {
             if (UserElo.getFightsOfSeason(user.getId(), mode.getSchemType()) < 10) continue;
 
             Optional<Integer> currentElo = UserElo.getElo(user.getId(), mode.getSchemType());
-            if (currentElo.isPresent() && currentElo.get() > maxEloOfPlayer) {
+            if (currentElo.isPresent()) {
-                maxEloOfPlayer = currentElo.get();
+                int currentMaxEloOfGameMode = UserElo.getMaxElo(mode.getSchemType());
-                arenaMode = mode;
+                int progression = getProgression(currentElo.get(), currentMaxEloOfGameMode);
+                if (progression > maxEmblemProgression) {
+                    maxEmblemProgression = progression;
+                    maxEloOfGameMode = currentMaxEloOfGameMode;
+                    maxEloOfPlayer = currentElo.get();
+                    arenaMode = mode;
+                }
             }
         }
 
@@ -122,7 +130,6 @@ public class UserElo {
             emblemCache.put(user.getId(), "");
             return "";
         }
-        int maxEloOfGameMode = UserElo.getMaxElo(arenaMode.getSchemType());
         String emblem = getEmblem(maxEloOfPlayer, maxEloOfGameMode);
         emblemCache.put(user.getId(), emblem);
         return emblem;