fixes to correct global map pool rating type

ta-forever · Sep 12, 2023 · 01d4a0c · 01d4a0c
1 parent 29a5d07
commit 01d4a0c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/com/faforever/client/game/CreateGameController.java b/src/main/java/com/faforever/client/game/CreateGameController.java
@@ -528,10 +528,11 @@ protected void setAvailableMapPools(String modTechnical) {
                     queues.stream().filter(q -> !q.getLeaderboard().getLeaderboardHidden()),
                     Stream.of(MatchmakingQueue.makePsuedoQueue(
                         ALL_MAPS_PSUEDO_QUEUE_NAME_KEY,
-                        featuredModListView.getSelectionModel().getSelectedItem())
+                        featuredModListView.getSelectionModel().getSelectedItem(),
+                        queues.isEmpty() ? DEFAULT_RATING_TYPE : queues.get(0).getLeaderboard().getTechnicalName())
                     )).toList();
                 mapPoolListView.getItems().setAll(availableQueues);
-                if (mapPoolListView.getItems().size() > 0) {
+                if (mapPoolListView.getItems().size() > 1) {
                   mapPoolListView.getSelectionModel().select(0);
                   rankedMapPoolsAvailableProperty.set(true);
                 }

diff --git a/src/main/java/com/faforever/client/teammatchmaking/MatchmakingQueue.java b/src/main/java/com/faforever/client/teammatchmaking/MatchmakingQueue.java
@@ -41,12 +41,13 @@ public MatchmakingQueue() {
     this.featuredMod = new SimpleObjectProperty<>(null);
   }
 
-  public static MatchmakingQueue makePsuedoQueue(String name, FeaturedMod mod) {
+  public static MatchmakingQueue makePsuedoQueue(String name, FeaturedMod mod, String ratingType) {
     MatchmakingQueue queue = new MatchmakingQueue();
     queue.setQueueName(name);
     queue.setFeaturedMod(mod);
     Leaderboard leaderboard = new Leaderboard();
     leaderboard.setNameKey(name);
+    leaderboard.setTechnicalName(ratingType);
     queue.setLeaderboard(leaderboard);
     return queue;
   }