Handle mods with nations but no major civs

This commit is contained in:
Yair Morgenstern
2022-12-16 16:02:06 +02:00
parent 14882cfecf
commit 44b77de4f5

View File

@ -291,9 +291,10 @@ class GameOptionsTable(
var desiredCiv = ""
if (gameParameters.mods.contains(mod)) {
val modNations = RulesetCache[mod]?.nations
if (modNations != null && modNations.size > 0)
desiredCiv = modNations.values.filter { it.isMajorCiv() }.random().name
val modNations = RulesetCache[mod]?.nations?.values?.filter { it.isMajorCiv() }
if (modNations != null && modNations.any())
desiredCiv = modNations.random().name
val music = UncivGame.Current.musicController
if (!music.chooseTrack(mod, MusicMood.Theme, MusicTrackChooserFlags.setSelectNation) && desiredCiv.isNotEmpty())