Merge pull request #26 from KaBooMa/bleeding-edge

Bleeding edge

Author: KaBooMa

S1API/Quests/Quest.cs

@@ -145,6 +145,8 @@ public Quest()
             poi.UIPrefab = uiPrefabObject;
 #endif
             S1Quest.PoIPrefab = poiPrefabObject;
+
+            S1Quest.onQuestEnd.AddListener((UnityAction<S1Quests.EQuestState>)OnQuestEnded);
         }
 
         /// <summary>
@@ -156,7 +158,7 @@ internal override void CreateInternal()
 
             base.CreateInternal();
 
-            // Initialize the quest
+            // Initialize the quest 
             S1Quest.InitializeQuest(Title, Description, Array.Empty<S1Data.QuestEntryData>(), S1Quest?.StaticGUID);
 
             if (AutoBegin)
@@ -172,6 +174,17 @@ internal override void SaveInternal(string folderPath, ref List<string> extraSav
             base.SaveInternal(questDataPath, ref extraSaveables);
         }
 
+        /// <summary>
+        /// INTERNAL: Called when the quest ends
+        /// </summary>
+        /// <param name="questState">The state it ended in.</param>
+        internal void OnQuestEnded(S1Quests.EQuestState questState)
+        {
+            // Cleanup our quest in the API manager as well as game quests list
+            S1Quests.Quest.Quests.Remove(S1Quest);
+            QuestManager.Quests.Remove(this);
+        }
+
         /// <summary>
         /// Adds a new quest entry to the quest.
         /// </summary>