Merge remote-tracking branch 'upstream/master'

update
This commit is contained in:
YueR 2019-09-27 07:41:10 +08:00
commit 84336c2c95

View File

@ -279,7 +279,6 @@ class CityInfo {
}
isPuppet=false
UnCivGame.Current.worldScreen.shouldUpdate=true
}
@ -342,7 +341,7 @@ class CityInfo {
reassignWorkers()
if(foundingCiv.cities.size == 1) cityConstructions.addBuilding("Palace") // Resurrection!
isPuppet = false
UnCivGame.Current.worldScreen.shouldUpdate=true
}