From c10fcd0d110fe1f4f5ee64798af1f68c92807d0a Mon Sep 17 00:00:00 2001
From: jalil <63772680+jalil49@users.noreply.github.com>
Date: Sun, 9 May 2021 06:45:58 -0500
Subject: [PATCH] commit

---
 Accessory States/Maker.cs    |  2 +-
 Accessory States/Settings.cs | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Accessory States/Maker.cs b/Accessory States/Maker.cs
index a7b0405..22babac 100644
--- a/Accessory States/Maker.cs	
+++ b/Accessory States/Maker.cs	
@@ -483,7 +483,7 @@ private IEnumerator WaitForSlots()
 
             while (ACC_Appearance_state.Control.ControlObjects.Count() < ACCData)
             {
-                yield return 0;
+                yield return null;
             }
             foreach (var item in ThisCharactersData.Now_ACC_State_array)
             {
diff --git a/Accessory States/Settings.cs b/Accessory States/Settings.cs
index 1f8bc5d..304ba6a 100644
--- a/Accessory States/Settings.cs	
+++ b/Accessory States/Settings.cs	
@@ -3,6 +3,7 @@
 using BepInEx.Logging;
 using KKAPI.Chara;
 using KKAPI.MainGame;
+using System;
 
 namespace Accessory_States
 {
@@ -22,9 +23,25 @@ public void Awake()
             Logger = base.Logger;
             Hooks.Init();
             CharacterApi.RegisterExtraBehaviour<CharaEvent>(GUID);
-            CharacterApi.RegisterExtraBehaviour<Dummy>("madevil.kk.ass");
+            if (!TryfindPluginInstance("madevil.kk.ass"))
+            {
+                CharacterApi.RegisterExtraBehaviour<Dummy>("madevil.kk.ass");
+            }
             GameAPI.RegisterExtraBehaviour<GameEvent>(GUID);
             NamingID = Config.Bind("Grouping ID", "Grouping ID", "2", "Requires restarting maker");
         }
+
+        private bool TryfindPluginInstance(string pluginName, Version minimumVersion = null)
+        {
+            BepInEx.Bootstrap.Chainloader.PluginInfos.TryGetValue(pluginName, out PluginInfo target);
+            if (null != target)
+            {
+                if (target.Metadata.Version >= minimumVersion)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }