diff --git a/android/build.gradle b/android/build.gradle index 0288c64b2c..0b84d5a86c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 221 - versionName "2.14.2" + versionCode 223 + versionName "2.14.3" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/logic/city/CityExpansionManager.kt b/core/src/com/unciv/logic/city/CityExpansionManager.kt index 4e8f6507e1..d5e29db95a 100644 --- a/core/src/com/unciv/logic/city/CityExpansionManager.kt +++ b/core/src/com/unciv/logic/city/CityExpansionManager.kt @@ -76,7 +76,9 @@ class CityExpansionManager { for(tile in cityInfo.tiles.map { cityInfo.tileMap[it] }) relinquishOwnership(tile) - cityInfo.getCenterTile().getTilesInDistance(1).forEach { takeOwnership(it) } + cityInfo.getCenterTile().getTilesInDistance(1) + .filter { it.getCity()!=null } // can't take ownership of owned tiles + .forEach { takeOwnership(it) } } private fun addNewTileWithCulture() { @@ -97,7 +99,8 @@ class CityExpansionManager { fun takeOwnership(tileInfo: TileInfo){ if(tileInfo.isCityCenter()) throw Exception("What?!") - if(tileInfo.getCity()!=null) tileInfo.getCity()!!.expansion.relinquishOwnership(tileInfo) + if(tileInfo.getCity()!=null) + tileInfo.getCity()!!.expansion.relinquishOwnership(tileInfo) cityInfo.tiles = cityInfo.tiles.withItem(tileInfo.position) tileInfo.owningCity = cityInfo diff --git a/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt b/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt index 686a4e7287..db5d56ca31 100644 --- a/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt +++ b/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt @@ -43,7 +43,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre else { pickProductionButton.color = Color.GRAY pickProductionButton.row() - pickProductionButton.add(rejectionReason.toLabel().setFontColor(Color.RED)) + pickProductionButton.add(rejectionReason.toLabel().setFontColor(Color.RED)).colspan(pickProductionButton.columns) } if(construction==cityScreen.city.cityConstructions.currentConstruction)