AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-23 11:34:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

NullReferenceException code is fixed (#2326)

Browse Source
This commit is contained in:
Jack Rainy 2020-04-03 09:58:49 +03:00 committed by GitHub
parent b94d624319
commit ec0f41d015
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
View File

@ -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