Skip to content

Commit

Permalink
more concise message about unknown map archive.
Browse files Browse the repository at this point in the history
fix for null currentGame.get().
  • Loading branch information
Axle1975 committed Mar 4, 2021
1 parent 935ec87 commit ad1282a
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/faforever/client/game/GameService.java
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ public void changed(ObservableValue<? extends GameStatus> observable, GameStatus
}

Player currentPlayer = getCurrentPlayer();
boolean playerStillInGame = currentPlayer != null && currentGame != null && currentPlayer.getCurrentGameUid() == currentGame.get().getId();
boolean playerStillInGame = currentPlayer != null && currentGame != null && currentGame.get() != null && currentPlayer.getCurrentGameUid() == currentGame.get().getId();
/*game.getTeams().entrySet().stream()
.flatMap(stringListEntry -> stringListEntry.getValue().stream())
.anyMatch(playerName -> playerName.equals(currentPlayer.getUsername()));*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/faforever/client/map/MapService.java
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ public CompletableFuture<Void> download(String modTechnical, String hpiArchiveNa
}
else {
notificationService.addNotification(new ImmediateNotification(
i18n.get("mapDownloadTask.title", hpiArchiveName), i18n.get("mapDownloadTask.notFound"),
i18n.get("mapDownloadTask.title", hpiArchiveName), i18n.get("mapDownloadTask.notFound", modTechnical, preferencesService.getTotalAnnihilation(modTechnical).getInstalledPath()),
Severity.WARN, Collections.singletonList(new DismissAction(i18n))));
}
return future;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ updateCheckTask.title=Checking for update
clientUpdateCheckTask.title=Checking for client update
clientUpdateDownloadTask.title=Downloading client update
mapDownloadTask.title=Downloading map {0}
mapDownloadTask.notFound=Your {0} installation at {1} appears to be missing the map the host has selected for this game. TAF tried to source the associated map pack/archive for you but was unable to find the right one. You may need to download and install this map yourself. Regardless, TAF has still joined you with the game ... maybe you can persuade the host to change the map (or maybe TAF is wrong and you do in fact have the map!)
mapDownloadTask.notFound=Your {0} installation at "{1}" is missing the map for this game and TAF is unable to source the associated archive. Continuing to join game regardless ...
mapReplayTask.title=Downloading replay {0}
downloadingModTask.downloading=Downloading mod {0}
downloadingModTask.unzipping=Unzipping mod to {0}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/messages_cs.properties
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ updateCheckTask.title = Hledání aktualizace
clientUpdateCheckTask.title = Hledání aktualizace klientu
clientUpdateDownloadTask.title = Stahování aktualizace klientu
mapDownloadTask.title = Stahování mapy {0}
mapDownloadTask.notFound=Your {0} installation at {1} appears to be missing the map the host has selected for this game. TAF tried to source the associated map pack/archive for you but was unable to find the right one. You may need to download and install this map yourself. Regardless, TAF has still joined you with the game ... maybe you can persuade the host to change the map (or maybe TAF is wrong and you do in fact have the map!)
mapDownloadTask.notFound=Your {0} installation at "{1}" is missing the map for this game and TAF is unable to source the associated archive. Continuing to join game regardless ...
mapReplayTask.title = Stahování záznamu {0}
downloadingModTask.downloading = Stahování módu {0}
downloadingModTask.unzipping = Rozbalování módu do {0}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/messages_es.properties
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ updateCheckTask.title = Buscando actualizaciones
clientUpdateCheckTask.title = Buscando actualizaciones del cliente
clientUpdateDownloadTask.title = Descargando actualización del cliente
mapDownloadTask.title = Descargando mapa {0}
mapDownloadTask.notFound=Your {0} installation at {1} appears to be missing the map the host has selected for this game. TAF tried to source the associated map pack/archive for you but was unable to find the right one. You may need to download and install this map yourself. Regardless, TAF has still joined you with the game ... maybe you can persuade the host to change the map (or maybe TAF is wrong and you do in fact have the map!)
mapDownloadTask.notFound=Your {0} installation at "{1}" is missing the map for this game and TAF is unable to source the associated archive. Continuing to join game regardless ...
mapReplayTask.title = Descargando repetición {0}
downloadingModTask.downloading = Descargando mod {0}
downloadingModTask.unzipping = Descomprimiendo mod a {0}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/messages_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ updateCheckTask.title = Vérification des mises à jour
clientUpdateCheckTask.title = Vérification des m.à.j du client
clientUpdateDownloadTask.title = Téléchargement de la m.à.j
mapDownloadTask.title = Téléchargement de la carte {0}
mapDownloadTask.notFound=Your {0} installation at {1} appears to be missing the map the host has selected for this game. TAF tried to source the associated map pack/archive for you but was unable to find the right one. You may need to download and install this map yourself. Regardless, TAF has still joined you with the game ... maybe you can persuade the host to change the map (or maybe TAF is wrong and you do in fact have the map!)
mapDownloadTask.notFound=Your {0} installation at "{1}" is missing the map for this game and TAF is unable to source the associated archive. Continuing to join game regardless ...
mapReplayTask.title = Téléchargement de la rediff. {0}
downloadingModTask.downloading = Téléchargement du mod {0}
downloadingModTask.unzipping = Décompression du mod vers {0}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/messages_it.properties
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ updateCheckTask.title = Controllo aggiornamenti
clientUpdateCheckTask.title = Controllo aggiornamenti del client
clientUpdateDownloadTask.title = Scaricamento aggiornamenti del client
mapDownloadTask.title = Scaricamento mappa {0}
mapDownloadTask.notFound=Your {0} installation at {1} appears to be missing the map the host has selected for this game. TAF tried to source the associated map pack/archive for you but was unable to find the right one. You may need to download and install this map yourself. Regardless, TAF has still joined you with the game ... maybe you can persuade the host to change the map (or maybe TAF is wrong and you do in fact have the map!)
mapDownloadTask.notFound=Your {0} installation at "{1}" is missing the map for this game and TAF is unable to source the associated archive. Continuing to join game regardless ...
mapReplayTask.title = Scaricamento replay {0}
downloadingModTask.downloading = Scaricamento mod {0}
downloadingModTask.unzipping = Decompressione mod in {0}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/messages_iw.properties
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ updateCheckTask.title = בודק עדכונים
clientUpdateCheckTask.title = מחפש עדכוני תוכנה
clientUpdateDownloadTask.title = מוריד עדכוני תוכנה
mapDownloadTask.title = מוריד מפה {0}
mapDownloadTask.notFound=Your {0} installation at {1} appears to be missing the map the host has selected for this game. TAF tried to source the associated map pack/archive for you but was unable to find the right one. You may need to download and install this map yourself. Regardless, TAF has still joined you with the game ... maybe you can persuade the host to change the map (or maybe TAF is wrong and you do in fact have the map!)
mapDownloadTask.notFound=Your {0} installation at "{1}" is missing the map for this game and TAF is unable to source the associated archive. Continuing to join game regardless ...
mapReplayTask.title = מוריד הקלטה {0}
downloadingModTask.downloading = מוריד מוד {0}
downloadingModTask.unzipping = מחלץ מוד ל {0}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/messages_nl.properties
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ updateCheckTask.title = Controleer voor update
clientUpdateCheckTask.title = Controleer client voor update
clientUpdateDownloadTask.title = Downloaden client update
mapDownloadTask.title = Downloaden map {0}
mapDownloadTask.notFound=Your {0} installation at {1} appears to be missing the map the host has selected for this game. TAF tried to source the associated map pack/archive for you but was unable to find the right one. You may need to download and install this map yourself. Regardless, TAF has still joined you with the game ... maybe you can persuade the host to change the map (or maybe TAF is wrong and you do in fact have the map!)
mapDownloadTask.notFound=Your {0} installation at "{1}" is missing the map for this game and TAF is unable to source the associated archive. Continuing to join game regardless ...
mapReplayTask.title = Laden herhaling {0}
downloadingModTask.downloading = Downloaden mod {0}
downloadingModTask.unzipping = Uitpakken mod naar {0}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/messages_pl.properties
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ updateCheckTask.title = Sprawdzanie aktualizacji
clientUpdateCheckTask.title = Sprawdzanie aktualizacji klienta
clientUpdateDownloadTask.title = Pobieranie aktualizacji klienta
mapDownloadTask.title = Pobieranie mapy {0}
mapDownloadTask.notFound=Your {0} installation at {1} appears to be missing the map the host has selected for this game. TAF tried to source the associated map pack/archive for you but was unable to find the right one. You may need to download and install this map yourself. Regardless, TAF has still joined you with the game ... maybe you can persuade the host to change the map (or maybe TAF is wrong and you do in fact have the map!)
mapDownloadTask.notFound=Your {0} installation at "{1}" is missing the map for this game and TAF is unable to source the associated archive. Continuing to join game regardless ...
mapReplayTask.title = Pobieranie powtórki {0}
downloadingModTask.downloading = Pobieranie moda {0}
downloadingModTask.unzipping = Wyodrębnianie modu {0}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/messages_ru.properties
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ updateCheckTask.title = Поиск обновлений
clientUpdateCheckTask.title = Поиск обновлений клиента
clientUpdateDownloadTask.title = Скачивание обновлений
mapDownloadTask.title = Загрузка карты {0}
mapDownloadTask.notFound=Your {0} installation at {1} appears to be missing the map the host has selected for this game. TAF tried to source the associated map pack/archive for you but was unable to find the right one. You may need to download and install this map yourself. Regardless, TAF has still joined you with the game ... maybe you can persuade the host to change the map (or maybe TAF is wrong and you do in fact have the map!)
mapDownloadTask.notFound=Your {0} installation at "{1}" is missing the map for this game and TAF is unable to source the associated archive. Continuing to join game regardless ...
mapReplayTask.title = Скачивание реплея {0}
downloadingModTask.downloading = Загрузка мода {0}
downloadingModTask.unzipping = Распаковка мода в {0}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/messages_tr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ updateCheckTask.title = Güncellemeler kontrol ediliyor
clientUpdateCheckTask.title = İstemci güncellemesi kontrol ediliyor
clientUpdateDownloadTask.title = İstemci güncellemesi indiriliyor
mapDownloadTask.title = Harita indiriliyor {0}
mapDownloadTask.notFound=Your {0} installation at {1} appears to be missing the map the host has selected for this game. TAF tried to source the associated map pack/archive for you but was unable to find the right one. You may need to download and install this map yourself. Regardless, TAF has still joined you with the game ... maybe you can persuade the host to change the map (or maybe TAF is wrong and you do in fact have the map!)
mapDownloadTask.notFound=Your {0} installation at "{1}" is missing the map for this game and TAF is unable to source the associated archive. Continuing to join game regardless ...
mapReplayTask.title = Tekrar indiriliyor {0}
downloadingModTask.downloading = Mod indiriliyor {0}
downloadingModTask.unzipping = Mod {0} a açılıyor
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/messages_uk.properties
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ updateCheckTask.title = Перевірка оновлень
clientUpdateCheckTask.title = Перевірка оновлень для клієнта
clientUpdateDownloadTask.title = Завантаження оновлення
mapDownloadTask.title = Завантаження мапи {0}
mapDownloadTask.notFound=Your {0} installation at {1} appears to be missing the map the host has selected for this game. TAF tried to source the associated map pack/archive for you but was unable to find the right one. You may need to download and install this map yourself. Regardless, TAF has still joined you with the game ... maybe you can persuade the host to change the map (or maybe TAF is wrong and you do in fact have the map!)
mapDownloadTask.notFound=Your {0} installation at "{1}" is missing the map for this game and TAF is unable to source the associated archive. Continuing to join game regardless ...
mapReplayTask.title = Завантажую повтор {0}
downloadingModTask.downloading = Завантаження моду {0}
downloadingModTask.unzipping = Розпакування моду до {0}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/messages_zh.properties
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ updateCheckTask.title = 检查更新
clientUpdateCheckTask.title = 检查客户端更新
clientUpdateDownloadTask.title = 正在下载客户端更新
mapDownloadTask.title = 正在下载地图{0}
mapDownloadTask.notFound=Your {0} installation at {1} appears to be missing the map the host has selected for this game. TAF tried to source the associated map pack/archive for you but was unable to find the right one. You may need to download and install this map yourself. Regardless, TAF has still joined you with the game ... maybe you can persuade the host to change the map (or maybe TAF is wrong and you do in fact have the map!)
mapDownloadTask.notFound=Your {0} installation at "{1}" is missing the map for this game and TAF is unable to source the associated archive. Continuing to join game regardless ...
mapReplayTask.title = 正在下载录像{0}
downloadingModTask.downloading = 正在下载MOD {0}
downloadingModTask.unzipping = 解压缩到{0}
Expand Down

0 comments on commit ad1282a

Please sign in to comment.