Merge pull request #141 from qe201020335/binding_fix

Fix MonoBehaviour custom counter menu binding
NuggoDEV · Aug 19, 2024 · 4623dbe · 4623dbe
2 parents 3046bcf + df00bea
commit 4623dbe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Counters+/Installers/CountersInstaller.cs b/Counters+/Installers/CountersInstaller.cs
@@ -95,7 +95,7 @@ protected void AddCounter<T, R>(Func<T, bool> additionalReasonToSpawn) where T :
 
             Plugin.Logger.Debug($"Loading counter {settings.DisplayName}...");
 
-            if (typeof(R).BaseType == typeof(MonoBehaviour))
+            if (typeof(MonoBehaviour).IsAssignableFrom(typeof(R)))
             {
                 Container.BindInterfacesAndSelfTo<R>().FromNewComponentOnRoot().AsSingle().NonLazy();
             }
@@ -117,7 +117,7 @@ protected void AddCustomCounter(CustomCounter customCounter, Type counterType)
 
                 Plugin.Logger.Debug($"Loading counter {customCounter.Name}...");
 
-                if (counterType.BaseType == typeof(MonoBehaviour))
+                if (typeof(MonoBehaviour).IsAssignableFrom(counterType))
                 {
                     Container.BindInterfacesAndSelfTo(counterType).FromNewComponentOnRoot().AsSingle().NonLazy();
                 }

diff --git a/Counters+/Installers/MenuUIInstaller.cs b/Counters+/Installers/MenuUIInstaller.cs
@@ -30,9 +30,9 @@ public override void InstallBindings()
                 if (customCounter.BSML != null && customCounter.BSML.HasType)
                 {
                     Type hostType = customCounter.BSML.HostType;
-                    if (hostType.BaseType == typeof(MonoBehaviour))
+                    if (typeof(MonoBehaviour).IsAssignableFrom(hostType))
                     {
-                        Container.Bind(hostType).WithId(customCounter.Name).FromComponentOnRoot().AsCached();
+                        Container.Bind(hostType).WithId(customCounter.Name).FromNewComponentOnNewGameObject().AsCached();
                     }
                     else
                     {