diff --git a/android/src/com/unciv/app/AndroidLauncher.kt b/android/src/com/unciv/app/AndroidLauncher.kt index dc421a7e1d..17b8b01d51 100644 --- a/android/src/com/unciv/app/AndroidLauncher.kt +++ b/android/src/com/unciv/app/AndroidLauncher.kt @@ -47,16 +47,16 @@ class AndroidLauncher : AndroidApplication() { * replaces them with the ones in the external folder!) */ private fun copyMods() { - // Mod directory in the internal app data (where Gdx.files.local looks) - val internalModsDir = File("${filesDir.path}/mods") + // Mod directory in the internal app data (where Gdx.files.local looks) + val internalModsDir = File("${filesDir.path}/mods") - // Mod directory in the shared app data (where the user can see and modify) - val externalModsDir = File("${getExternalFilesDir(null)?.path}/mods") + // Mod directory in the shared app data (where the user can see and modify) + val externalModsDir = File("${getExternalFilesDir(null)?.path}/mods") - // Copy external mod directory (with data user put in it) to internal (where it can be read) - if (!externalModsDir.exists()) externalModsDir.mkdirs() // this can fail sometimes, which is why we check if it exists again in the next line - if (externalModsDir.exists()) externalModsDir.copyRecursively(internalModsDir) - } + // Copy external mod directory (with data user put in it) to internal (where it can be read) + if (!externalModsDir.exists()) externalModsDir.mkdirs() // this can fail sometimes, which is why we check if it exists again in the next line + if (externalModsDir.exists()) externalModsDir.copyRecursively(internalModsDir, true) + } override fun onPause() { if (UncivGame.Companion.isCurrentInitialized() diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 3b5909be91..be772d707f 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -3,8 +3,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.3.71" const val appName = "Unciv" - const val appCodeNumber = 481 - const val appVersion = "3.11.1" + const val appCodeNumber = 482 + const val appVersion = "3.11.1-patch1" const val gdxVersion = "1.9.10" const val roboVMVersion = "2.3.1" diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index 3cffcd89d1..62a599031a 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -246,7 +246,8 @@ class CityInfo { fun getGreatPersonMap():StatMap { val stats = StatMap() for((specialist, amount) in population.getNewSpecialists()) - stats.add("Specialists", getRuleset().specialists[specialist]!!.greatPersonPoints.times(amount)) + if (getRuleset().specialists.containsKey(specialist)) // To solve problems in total remake mods + stats.add("Specialists", getRuleset().specialists[specialist]!!.greatPersonPoints.times(amount)) val buildingStats = Stats() for (building in cityConstructions.getBuiltBuildings())