mirror of
https://github.com/yairm210/Unciv.git
synced 2025-09-27 05:46:43 -04:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
6d3423f5b0
@ -642,15 +642,6 @@ class DiplomacyManager() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (otherCiv.isCityState()) {
|
||||
for (thirdCiv in otherCiv.getProtectorCivs()) {
|
||||
if (thirdCiv.knows(civInfo)
|
||||
&& thirdCiv.getDiplomacyManager(civInfo).canDeclareWar()) {
|
||||
thirdCiv.getDiplomacyManager(civInfo).declareWar()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** Should only be called from makePeace */
|
||||
|
Loading…
x
Reference in New Issue
Block a user