Refactored event listeners to rely on intermediate method to trigger event

Author: danigfedev

Runtime/SOBaseEvents/EventListener.cs

@@ -15,17 +15,22 @@ private void OnEnable()
         {
             if (_typedEvent != null)
             {
-                _typedEvent.AddListener(OnEventRaised);
+                _typedEvent.AddListener(OnEventRaiseRequested);
             }
         }
 
         private void OnDisable()
         {
             if (_typedEvent != null)
             {
-                _typedEvent.RemoveListener(OnEventRaised);
+                _typedEvent.RemoveListener(OnEventRaiseRequested);
             }
         }
+
+        private void OnEventRaiseRequested()
+        {
+            OnEventRaised?.Invoke();
+        }
     }
 
     public abstract class EventListener<TEvent, TArg> : MonoBehaviour where TEvent : class, ISOEventRegistry<TArg>
@@ -40,17 +45,22 @@ private void OnEnable()
         {
             if (_typedEvent != null)
             {
-                _typedEvent.AddListener(OnEventRaised);
+                _typedEvent.AddListener(OnEventRaiseRequested);
             }
         }
 
         private void OnDisable()
         {
             if (_typedEvent != null)
             {
-                _typedEvent.RemoveListener(OnEventRaised);
+                _typedEvent.RemoveListener(OnEventRaiseRequested);
             }
         }
+        
+        private void OnEventRaiseRequested(TArg value)
+        {
+            OnEventRaised?.Invoke(value);
+        }
     }
 
     public abstract class EventListener<TEvent, TArg1, TArg2> : MonoBehaviour where TEvent : class, ISOEventRegistry<TArg1, TArg2>
@@ -65,17 +75,22 @@ private void OnEnable()
         {
             if (_typedEvent != null)
             {
-                _typedEvent.AddListener(OnEventRaised);
+                _typedEvent.AddListener(OnEventRaiseRequested);
             }
         }
 
         private void OnDisable()
         {
             if (_typedEvent != null)
             {
-                _typedEvent.RemoveListener(OnEventRaised);
+                _typedEvent.RemoveListener(OnEventRaiseRequested);
             }
         }
+        
+        private void OnEventRaiseRequested(TArg1 value1, TArg2 value2)
+        {
+            OnEventRaised?.Invoke(value1, value2);
+        }
     }
 
     public abstract class EventListener<TEvent, TArg1, TArg2, TArg3> : MonoBehaviour where TEvent : class, ISOEventRegistry<TArg1, TArg2, TArg3>
@@ -90,16 +105,21 @@ private void OnEnable()
         {
             if (_typedEvent != null)
             {
-                _typedEvent.AddListener(OnEventRaised);
+                _typedEvent.AddListener(OnEventRaiseRequested);
             }
         }
 
         private void OnDisable()
         {
             if (_typedEvent != null)
             {
-                _typedEvent.RemoveListener(OnEventRaised);
+                _typedEvent.RemoveListener(OnEventRaiseRequested);
             }
         }
+
+        private void OnEventRaiseRequested(TArg1 value1, TArg2 value2, TArg3 value3)
+        {
+            OnEventRaised?.Invoke(value1, value2, value3);
+        }
     }
 }