Skip to content

Commit

Permalink
Apparently .replaceAll is incompatible with Android 5.1, but hey who …
Browse files Browse the repository at this point in the history
…needs them.
  • Loading branch information
yairm210 committed Mar 24, 2019
1 parent bba6f43 commit e43c22a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app"
minSdkVersion 14
targetSdkVersion 28
versionCode 219
versionName "2.14.1"
versionCode 220
versionName "2.14.1.patch1"
}

// Had to add this crap for Travis to build, it wanted to sign the app
Expand Down
5 changes: 4 additions & 1 deletion core/src/com/unciv/logic/GameInfo.kt
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,10 @@ class GameInfo {
// As of 2.14.1, changed Machu Pichu to Machu Picchu
val oldMachuName = "Machu Pichu"
val newMachuName = "Machu Picchu"
cityConstructions.builtBuildings.replaceAll { if (it == oldMachuName) newMachuName else it }
if(cityConstructions.builtBuildings.contains(oldMachuName)){
cityConstructions.builtBuildings.remove(oldMachuName)
cityConstructions.builtBuildings.add(newMachuName)
}
if (cityConstructions.currentConstruction == oldMachuName)
cityConstructions.currentConstruction = newMachuName
if (cityConstructions.inProgressConstructions.containsKey(oldMachuName)) {
Expand Down
Binary file modified extraImages/Feature graphic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e43c22a

Please sign in to comment.