Merge pull request #6 from Thundernerd/develop

Fixed incorrectly throwing error when a method is static

Author: Thundernerd

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.2.1] - 2020-10-15
+
+### Fixed
+- Incorrectly trowing SubscriptionIsNullException when a method is static
+
 ## [1.2.0] - 2020-09-02
 
 ### Updated

Runtime/SafeEvent.cs

@@ -33,19 +33,19 @@ public void Invoke()
 
         private static void ThrowIfInvalidSubscription(Action subscription)
         {
-            if (subscription?.Target == null)
+            if (subscription == null)
             {
                 throw new SubscriptionIsNullException();
             }
 
-            if (subscription.Target is Component component && !component)
+            switch (subscription.Target)
             {
-                throw new SubscriptionIsNullException();
-            }
-
-            if (subscription.Target is GameObject gameObject && !gameObject)
-            {
-                throw new SubscriptionIsNullException();
+                case null when !subscription.Method.IsStatic:
+                    throw new SubscriptionIsNullException();
+                case Component component when !component:
+                    throw new SubscriptionIsNullException();
+                case GameObject gameObject when !gameObject:
+                    throw new SubscriptionIsNullException();
             }
         }
 

Runtime/SafeEventOneParameter.cs

@@ -33,19 +33,19 @@ public void Invoke(T obj)
 
         private static void ThrowIfInvalidSubscription(Action<T> subscription)
         {
-            if (subscription?.Target == null)
+            if (subscription == null)
             {
                 throw new SubscriptionIsNullException();
             }
 
-            if (subscription.Target is Component component && !component)
+            switch (subscription.Target)
             {
-                throw new SubscriptionIsNullException();
-            }
-
-            if (subscription.Target is GameObject gameObject && !gameObject)
-            {
-                throw new SubscriptionIsNullException();
+                case null when !subscription.Method.IsStatic:
+                    throw new SubscriptionIsNullException();
+                case Component component when !component:
+                    throw new SubscriptionIsNullException();
+                case GameObject gameObject when !gameObject:
+                    throw new SubscriptionIsNullException();
             }
         }
 

Runtime/SafeEventTwoParameters.cs

@@ -33,19 +33,19 @@ public void Invoke(T arg1, T2 arg2)
 
         private static void ThrowIfInvalidSubscription(Action<T, T2> subscription)
         {
-            if (subscription?.Target == null)
+            if (subscription == null)
             {
                 throw new SubscriptionIsNullException();
             }
 
-            if (subscription.Target is Component component && !component)
+            switch (subscription.Target)
             {
-                throw new SubscriptionIsNullException();
-            }
-
-            if (subscription.Target is GameObject gameObject && !gameObject)
-            {
-                throw new SubscriptionIsNullException();
+                case null when !subscription.Method.IsStatic:
+                    throw new SubscriptionIsNullException();
+                case Component component when !component:
+                    throw new SubscriptionIsNullException();
+                case GameObject gameObject when !gameObject:
+                    throw new SubscriptionIsNullException();
             }
         }
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "net.tnrd.safeevent",
   "displayName": "Safe Event",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "unity": "2019.1",
   "description": "An event class that has extra checks to help prevent mistakes",
   "keywords": [