wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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) {
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)