Fixes after coderabbitai

Author: GodFuper

src/main/java/com/faforever/client/preferences/MatchmakerPrefs.java

@@ -19,7 +19,6 @@ public class MatchmakerPrefs {
 
   private final ObservableSet<Integer> selectedQueueIds = observableSet();
 
-
   public ObservableList<Faction> getFactions() {
     return factions;
   }

src/main/java/com/faforever/client/teammatchmaking/TeamMatchmakingService.java

@@ -260,7 +260,14 @@ public void afterPropertiesSet() throws Exception {
 
     partyMembersNotReady.bind(playersInGame.emptyProperty().map(empty -> !empty));
 
-    queues.forEach(queue -> listenToSelectedChange(queue));
+    gameService.getGames().subscribe(() -> queues.forEach(this::updateMatchmakerGameCount));
+
+    queues.forEach(queue -> {
+      if (queue.isSelected()) {
+        matchmakerPrefs.getSelectedQueueIds().add(queue.getId());
+      }
+      listenToSelectedChange(queue);
+    });
     queues.addListener((Change<? extends MatchmakerQueueInfo> change) -> {
       while (change.next()) {
         if (change.wasAdded()) {
@@ -457,22 +464,15 @@ private void updateMatchmakerGameCount(MatchmakerQueueInfo matchmakerQueue) {
   private Mono<MatchmakerQueueInfo> getQueueFromApi(MatchmakerInfo.MatchmakerQueue matchmakerQueue) {
     ElideNavigatorOnCollection<MatchmakerQueue> navigator = ElideNavigator.of(MatchmakerQueue.class)
                                                                           .collection()
-                                                                          .setFilter(qBuilder().string("technicalName")
-                                                                                               .eq(matchmakerQueue.getName()));
-    return fafApiAccessor.getMany(navigator)
-                         .next()
+                                                                          .setFilter(qBuilder().string("technicalName").eq(matchmakerQueue.getName()));
+    return fafApiAccessor.getMany(navigator).next()
                          .map(matchmakerMapper::map)
                          .map(queue -> matchmakerMapper.update(matchmakerQueue, queue))
                          .doOnNext(queue -> {
                            boolean isSelected = !matchmakerPrefs.getUnselectedQueueIds().contains(queue.getId());
                            queue.setSelected(isSelected);
                          })
-                         .doOnNext(queue -> {
-                           gameService.getGames().subscribe(() -> updateMatchmakerGameCount(queue));
-                         })
-                         .doOnNext(queue -> {
-                           nameToQueue.put(queue.getTechnicalName(), queue);
-                         });
+                         .doOnNext(queue -> nameToQueue.put(queue.getTechnicalName(), queue));
   }
 
   public CompletableFuture<Boolean> joinQueues() {
@@ -495,7 +495,6 @@ public CompletableFuture<Boolean> joinQueues() {
 
     validQueues.forEach(queue -> {
       queue.setSelected(true);
-      matchmakerPrefs.getSelectedQueueIds().add(queue.getId());
     });
 
     return featuredModService.updateFeaturedModToLatest(FAF.getTechnicalName(), false)