fix: Resolved issue when removing from actions

S1API/Internal/Abstraction/EventHelper.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine.Events;
+
+namespace S1API.Internal.Abstraction
+{
+    /// <summary>
+    /// INTERNAL: This static class provides us an easy wrapper for subscribing and unsubscribing unity actions.
+    /// </summary>
+    internal static class EventHelper
+    {
+        /// <summary>
+        /// INTERNAL: Tracking for subscribed actions.
+        /// </summary>
+        internal static readonly Dictionary<Action, UnityAction> SubscribedActions = new Dictionary<Action, UnityAction>();
+
+        /// <summary>
+        /// INTERNAL: Adds a listener to the event, as well as the subscription list.
+        /// </summary>
+        /// <param name="listener">The action / method you want to subscribe.</param>
+        /// <param name="unityEvent">The event you want to subscribe to.</param>
+        internal static void AddListener(Action listener, UnityEvent unityEvent)
+        {
+            if (SubscribedActions.ContainsKey(listener))
+                return;
+
+            UnityAction wrappedListener = (UnityAction)listener.Invoke;
+            unityEvent.AddListener(wrappedListener);
+            SubscribedActions.Add(listener, wrappedListener);
+        }
+
+        /// <summary>
+        /// INTERNAL: Removes a listener to the event, as well as the subscription list.
+        /// </summary>
+        /// <param name="listener">The action / method you want to unsubscribe.</param>
+        /// <param name="unityEvent">The event you want to unsubscribe from.</param>
+        internal static void RemoveListener(Action listener, UnityEvent unityEvent)
+        {
+            SubscribedActions.TryGetValue(listener, out UnityAction wrappedAction);
+            SubscribedActions.Remove(listener);
+            unityEvent.RemoveListener(wrappedAction);
+        }
+    }
+}

S1API/Quests/QuestEntry.cs

@@ -3,9 +3,10 @@
 #elif (MONO)
 using S1Quests = ScheduleOne.Quests;
 #endif
+
 using System;
+using S1API.Internal.Abstraction;
 using UnityEngine;
-using UnityEngine.Events;
 
 namespace S1API.Quests
 {
@@ -31,8 +32,8 @@ internal QuestEntry(S1Quests.QuestEntry questEntry) =>
         /// </summary>
         public event Action OnComplete
         {
-            add => S1QuestEntry.onComplete.AddListener((UnityAction)value.Invoke);
-            remove => S1QuestEntry.onComplete.RemoveListener((UnityAction)value.Invoke);
+            add => EventHelper.AddListener(value, S1QuestEntry.onComplete);
+            remove => EventHelper.RemoveListener(value, S1QuestEntry.onComplete);
         }
 
         /// <summary>

S1API/Storages/StorageInstance.cs

@@ -6,8 +6,8 @@
 
 using System;
 using System.Linq;
+using S1API.Internal.Abstraction;
 using S1API.Items;
-using UnityEngine.Events;
 
 namespace S1API.Storages
 {
@@ -48,23 +48,23 @@ public bool CanItemFit(ItemInstance itemInstance, int quantity = 1) =>
         /// <param name="itemInstance">The item instance you want to store.</param>
         public void AddItem(ItemInstance itemInstance) => 
             S1Storage.InsertItem(itemInstance.S1ItemInstance);
-        
+
         /// <summary>
         /// An action fired when the storage container is opened by the player.
         /// </summary>
         public event Action OnOpened
         {
-            add => S1Storage.onOpened.AddListener((UnityAction)value.Invoke);
-            remove => S1Storage.onOpened.RemoveListener((UnityAction)value.Invoke);
+            add => EventHelper.AddListener(value, S1Storage.onOpened);
+            remove => EventHelper.RemoveListener(value, S1Storage.onOpened);
         }
 
         /// <summary>
         /// An action fired when the storage container is closed by the player.
         /// </summary>
         public event Action OnClosed
         {
-            add => S1Storage.onClosed.AddListener((UnityAction)value.Invoke);
-            remove => S1Storage.onClosed.RemoveListener((UnityAction)value.Invoke);
+            add => EventHelper.AddListener(value, S1Storage.onClosed);
+            remove => EventHelper.RemoveListener(value, S1Storage.onClosed);
         }
     }
 }