AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when borrowing names (#4800)

Browse Source 
* Fixed crash when borrowing names

* Fix potential mod error allowed by the previous fix
This commit is contained in:
Xander Lenstra 2021-08-07 22:44:16 +02:00 committed by GitHub
parent 9a24f04d56
commit 0c1a21f6ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/models/ruleset/Nation.kt
View File

@ -94,7 +94,7 @@ class Nation : INamed, ICivilopediaText {
disembarkCosts1 = uniques.contains("Units pay only 1 movement point to disembark") disembarkCosts1 = uniques.contains("Units pay only 1 movement point to disembark")
} }
lateinit var cities: ArrayList<String> var cities: ArrayList<String> = arrayListOf()
/** Used only by NewGame Nation picker */ /** Used only by NewGame Nation picker */

6
core/src/com/unciv/models/ruleset/Ruleset.kt
View File

@ -308,6 +308,12 @@ class Ruleset {
lines += "${building.name} must either have an explicit cost or reference an existing tech!" lines += "${building.name} must either have an explicit cost or reference an existing tech!"
} }
for (nation in nations.values) {
if (nation.cities.isEmpty() && !nation.isSpectator() && !nation.isBarbarian()) {
lines += "${nation.name} can settle cities, but has no city names!"
}
}
if (!modOptions.isBaseRuleset) return CheckModLinksResult(warningCount, lines) if (!modOptions.isBaseRuleset) return CheckModLinksResult(warningCount, lines)