mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2024-12-23 01:24:26 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when attacking city with disabled overlays (#8599)

Browse Source 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
This commit is contained in:
vegeta1k95 2023-02-06 08:13:57 +01:00 committed by GitHub
parent c77ab71381
commit 8f56a88990
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/ui/worldscreen/bottombar/BattleTableHelpers.kt
View File

@ -24,7 +24,11 @@ object BattleTableHelpers {
sequence {
val tileGroup = mapHolder.tileGroups[combatant.getTile()]!!
when {
combatant.isCity() -> yield(tileGroup.layerMisc.improvementIcon!!)
combatant.isCity() -> {
val icon = tileGroup.layerMisc.improvementIcon
if (icon != null)
yield(icon)
}
else -> {
val slot = if (combatant.isCivilian()) 0 else 1
yieldAll((tileGroup.layerUnitArt.getChild(slot) as Group).children)