AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-10-01 07:51:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #299 from ninjatao/fix_conquered_population

Browse Source 
Fix : city might have negative free population after been conquered.
This commit is contained in:
yairm210 2018-12-04 12:32:25 +02:00 committed by GitHub
commit eba64d38ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -139,6 +139,7 @@ class Battle(val gameInfo:GameInfo) {
city.expansion.cultureStored = 0 city.expansion.cultureStored = 0
city.expansion.reset() city.expansion.reset()
} }
city.population.unassignExtraPopulation()
city.moveToCiv(attacker.getCivilization()) city.moveToCiv(attacker.getCivilization())
} }