From 7ac515ad6e80c9d0f31709b6cda808d1fcb336a7 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 4 Feb 2020 09:20:45 +0200 Subject: [PATCH] If you're at war with someone, then 'please don't settle cities near us' is irrelevant --- core/src/com/unciv/logic/automation/NextTurnAutomation.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt index 3a3d43d866..f052de5fa0 100644 --- a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt +++ b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt @@ -515,7 +515,7 @@ class NextTurnAutomation{ 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) if(diploManager.hasFlag(DiplomacyFlags.SettledCitiesNearUs)) onCitySettledNearBorders(civInfo,otherCiv)