From c760510f5b26dfd7fed5cdb9ac8168a6d6311439 Mon Sep 17 00:00:00 2001
From: SimonCeder <simon.ceder@gmail.com>
Date: Sun, 31 Jul 2022 14:24:07 +0200
Subject: [PATCH] Invalid players removed from global quests

---
 core/src/com/unciv/logic/civilization/QuestManager.kt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/com/unciv/logic/civilization/QuestManager.kt b/core/src/com/unciv/logic/civilization/QuestManager.kt
index 17d9edcfaf..bdf2b27b93 100644
--- a/core/src/com/unciv/logic/civilization/QuestManager.kt
+++ b/core/src/com/unciv/logic/civilization/QuestManager.kt
@@ -234,6 +234,9 @@ class QuestManager : IsPartOfGameInfoSerialization {
     }
 
     private fun handleGlobalQuests() {
+        // Remove any participants that are no longer valid because of being dead or at war with the CS
+        assignedQuests.removeAll { it.isGlobal() &&
+            !canAssignAQuestTo(civInfo.gameInfo.getCivilization(it.assignee)) }
         val globalQuestsExpired = assignedQuests.filter { it.isGlobal() && it.isExpired() }.map { it.questName }.distinct()
         for (globalQuestName in globalQuestsExpired)
             handleGlobalQuest(globalQuestName)