Fixes to project template MonoBehaviour

Zingabopp · Jan 17, 2020 · ddd9ecc · ddd9ecc
1 parent 8972371
commit ddd9ecc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/BSIPA Plugin (Core)/MonobehaviourTemplate.cs b/BSIPA Plugin (Core)/MonobehaviourTemplate.cs
@@ -25,7 +25,11 @@ private void Awake()
             // For this particular MonoBehaviour, we only want one instance to exist at any time, so store a reference to it in a static property
             //   and destroy any that are created while one already exists.
             if (instance != null)
+            {
+                Logger.log?.Warn($"Instance of {this.GetType().Name} already exists, destroying.");
                 GameObject.DestroyImmediate(this);
+                return;
+            }
             GameObject.DontDestroyOnLoad(this); // Don't destroy this object on scene changes
             instance = this;
             Logger.log?.Debug($"{name}: Awake()");

diff --git a/BSIPA Plugin (Disableable)/MonobehaviourTemplate.cs b/BSIPA Plugin (Disableable)/MonobehaviourTemplate.cs
@@ -25,7 +25,11 @@ private void Awake()
             // For this particular MonoBehaviour, we only want one instance to exist at any time, so store a reference to it in a static property
             //   and destroy any that are created while one already exists.
             if (instance != null)
+            {
+                Logger.log?.Warn($"Instance of {this.GetType().Name} already exists, destroying.");
                 GameObject.DestroyImmediate(this);
+                return;
+            }
             GameObject.DontDestroyOnLoad(this); // Don't destroy this object on scene changes
             instance = this;
             Logger.log?.Debug($"{name}: Awake()");