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

If you're at war with someone, then 'please don't settle cities near us' is irrelevant

Browse Source
This commit is contained in:
Yair Morgenstern 2020-02-04 09:20:45 +02:00
parent 748168398e
commit 7ac515ad6e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/automation/NextTurnAutomation.kt
View File

@ -515,7 +515,7 @@ class NextTurnAutomation{
private fun issueRequests(civInfo: CivilizationInfo) { private fun issueRequests(civInfo: CivilizationInfo) {
for(otherCiv in civInfo.getKnownCivs().filter { it.isMajorCiv() }){ for(otherCiv in civInfo.getKnownCivs().filter { it.isMajorCiv() && !civInfo.isAtWarWith(it) }){
val diploManager = civInfo.getDiplomacyManager(otherCiv) val diploManager = civInfo.getDiplomacyManager(otherCiv)
if(diploManager.hasFlag(DiplomacyFlags.SettledCitiesNearUs)) if(diploManager.hasFlag(DiplomacyFlags.SettledCitiesNearUs))
onCitySettledNearBorders(civInfo,otherCiv) onCitySettledNearBorders(civInfo,otherCiv)