From ec0f41d01563fec729188464cb7e65e601bae179 Mon Sep 17 00:00:00 2001 From: Jack Rainy Date: Fri, 3 Apr 2020 09:58:49 +0300 Subject: [PATCH] NullReferenceException code is fixed (#2326) --- core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt b/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt index 99cc22dd15..027cada737 100644 --- a/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt +++ b/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt @@ -7,7 +7,6 @@ import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane import com.badlogic.gdx.scenes.scene2d.ui.Slider import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.TextButton -import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener import com.unciv.Constants import com.unciv.UncivGame import com.unciv.logic.map.RoadStatus @@ -183,7 +182,7 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera val terrainObject = ruleset.terrains[terrain]!! if (terrainObject.type == TerrainType.TerrainFeature) { tileInfo.baseTerrain = - if (terrainObject.occursOn == null) terrainObject.occursOn!!.first() + if (terrainObject.occursOn != null) terrainObject.occursOn.first() else "Grassland" tileInfo.terrainFeature = terrain } else tileInfo.baseTerrain = terrain