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

Fixed crash when a city had negative population due to faster razing (#4389)

Browse Source
This commit is contained in:
Xander Lenstra 2021-07-06 18:41:23 +02:00 committed by GitHub
parent 7875ec4896
commit 9e37cc8f16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -409,7 +409,7 @@ class CityInfo {
cityConstructions.endTurn(stats) cityConstructions.endTurn(stats)
expansion.nextTurn(stats.culture) expansion.nextTurn(stats.culture)
if (isBeingRazed) { if (isBeingRazed) {
val removedPopulation = 1 + civInfo.getMatchingUniques("Cities are razed [] times as fast").sumBy { it.params[0].toInt() } val removedPopulation = 1 + civInfo.getMatchingUniques("Cities are razed [] times as fast").sumBy { it.params[0].toInt() - 1 }
population.addPopulation(-1 * removedPopulation) population.addPopulation(-1 * removedPopulation)
if (population.population <= 0) { if (population.population <= 0) {
civInfo.addNotification("[$name] has been razed to the ground!", location, "OtherIcons/Fire") civInfo.addNotification("[$name] has been razed to the ground!", location, "OtherIcons/Fire")

1
core/src/com/unciv/logic/city/PopulationManager.kt
View File

@ -73,6 +73,7 @@ class PopulationManager {
internal fun addPopulation(count: Int) { internal fun addPopulation(count: Int) {
population += count population += count
if (population < 0) population = 0
val freePopulation = getFreePopulation() val freePopulation = getFreePopulation()
if (freePopulation < 0) { if (freePopulation < 0) {
unassignExtraPopulation() unassignExtraPopulation()