Merge 9eac943 into f4b2fef

FAForever · Aug 22, 2020 · 386a70b · 386a70b
2 parents f4b2fef + 9eac943
commit 386a70b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/faforever/client/patch/GameUpdaterImpl.java b/src/main/java/com/faforever/client/patch/GameUpdaterImpl.java
@@ -73,7 +73,7 @@ public CompletableFuture<Void> update(FeaturedMod featuredMod, Integer version,
 
     if (!NAMES_OF_FEATURED_BASE_MODS.contains(featuredMod.getTechnicalName())) {
       future = future.thenCompose(aVoid -> modService.getFeaturedMod(FAF.getTechnicalName()))
-          .thenCompose(baseMod -> updateFeaturedMod(baseMod, null))
+          .thenCompose(baseMod -> updateFeaturedMod(baseMod, version))
           .thenAccept(patchResults::add);
     }
 

diff --git a/src/main/java/com/faforever/client/replay/ReplayService.java b/src/main/java/com/faforever/client/replay/ReplayService.java
@@ -513,14 +513,14 @@ private void runFafReplayFile(Path path) throws IOException {
 
     // For some reason in the coop replay the map name is null in the metadata
     // So we just take it directly from the replay data.
-    if (StringUtils.isEmptyOrNull(mapName)) {
+    if (gameType.equals("coop")) {
       mapName = parseMapFolderName(rawReplayBytes);
     }
 
     // For map generator games the map name is "None" because replay server gets map name by from DB based on filename
     // from replay data, and DB does not contain generated maps.
     if (StringUtils.equalsIgnoreCase(mapName, "None")) {
-      String maybeMapGen = parseMapName(rawReplayBytes).replaceAll(".scmap", "");
+      String maybeMapGen = parseMapFolderName(rawReplayBytes);
       if (mapGeneratorService.isGeneratedMap(maybeMapGen)) {
         mapName = maybeMapGen;
       }