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

Fixes #5113 (#5122)

Browse Source 
* Fixed #5113

* Better check
This commit is contained in:
Xander Lenstra 2021-09-08 19:42:58 +02:00 committed by GitHub
parent 9a29ce8422
commit a1f7721878
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/automation/WorkerAutomation.kt
View File

@ -281,14 +281,20 @@ class WorkerAutomation(
val city = tile.getCity() val city = tile.getCity()
if (city == null || city.civInfo != civInfo) if (city == null || city.civInfo != civInfo)
return false return false
if (tile.improvement != null && !UncivGame.Current.settings.automatedWorkersReplaceImprovements) if (tile.improvement != null && !UncivGame.Current.settings.automatedWorkersReplaceImprovements) {
return false if (unit != null) {
if (unit.civInfo.isPlayerCivilization())
return false
} else if (UncivGame.Current.gameInfo.currentPlayerCiv.isPlayerCivilization())
return false
}
if (tile.improvement == null) { if (tile.improvement == null) {
if (unit == null) return true if (unit == null) return true
if (tile.improvementInProgress != null && unit.canBuildImprovement(tile.getTileImprovementInProgress()!!, tile)) return true if (tile.improvementInProgress != null && unit.canBuildImprovement(tile.getTileImprovementInProgress()!!, tile)) return true
val chosenImprovement = chooseImprovement(unit, tile) val chosenImprovement = chooseImprovement(unit, tile)
if (chosenImprovement != null && tile.canBuildImprovement(chosenImprovement, civInfo) && unit.canBuildImprovement(chosenImprovement, tile)) return true if (chosenImprovement != null && tile.canBuildImprovement(chosenImprovement, civInfo) && unit.canBuildImprovement(chosenImprovement, tile)) return true
} else if (!tile.containsGreatImprovement() && tile.hasViewableResource(civInfo) } else if (!tile.containsGreatImprovement() && tile.hasViewableResource(civInfo)
&& tile.getTileResource().improvement != tile.improvement && tile.getTileResource().improvement != tile.improvement
&& (unit == null || chooseImprovement(unit, tile) // if the chosen improvement is not null and buildable && (unit == null || chooseImprovement(unit, tile) // if the chosen improvement is not null and buildable