mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-15 04:14:44 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #9163 - Can again spectate games where not an original participant

Browse Source
This commit is contained in:
Yair Morgenstern 2023-04-13 17:51:11 +03:00
parent 2fbd24231f
commit e7653bd53d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/GameInfo.kt
View File

@ -204,7 +204,8 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion
val civMap by lazy { civilizations.associateBy { it.civName } } val civMap by lazy { civilizations.associateBy { it.civName } }
/** Get a civ by name /** Get a civ by name
* @throws NoSuchElementException if no civ of that name is in the game (alive or dead)! */ * @throws NoSuchElementException if no civ of that name is in the game (alive or dead)! */
fun getCivilization(civName: String) = civMap.getValue(civName) fun getCivilization(civName: String) = civMap[civName]
?: civilizations.first { it.civName == civName } // This is for spectators who are added in later, artificially
fun getCurrentPlayerCivilization() = currentPlayerCiv fun getCurrentPlayerCivilization() = currentPlayerCiv
fun getCivilizationsAsPreviews() = civilizations.map { it.asPreview() }.toMutableList() fun getCivilizationsAsPreviews() = civilizations.map { it.asPreview() }.toMutableList()
/** Get barbarian civ /** Get barbarian civ