Merge remote-tracking branch 'origin/master'

This commit is contained in:
yairm210 2021-11-03 15:57:56 +02:00
commit 0065d1052b

View File

@ -525,7 +525,7 @@ class QuestManager {
if (civInfo == cityState) {
// Revoke most quest types from the bully
val revokedQuests = assignedQuests.asSequence()
.filter { it.isIndividual() || it.questName == QuestName.Invest.value }
.filter { it.assignee == bully.civName && (it.isIndividual() || it.questName == QuestName.Invest.value) }
assignedQuests.removeAll(revokedQuests)
if (revokedQuests.count() > 0)
bully.addNotification("[${civInfo.civName}] cancelled the quests they had given you because you demanded tribute from them.",