1.4.1 | Fix OnDisabled Error

Vretu-Dev · Sep 29, 2024 · beda7f0 · beda7f0
1 parent 1997340
commit beda7f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/UsefulHints/EventHandlers/Modules/JailbirdPatchHandler.cs b/UsefulHints/EventHandlers/Modules/JailbirdPatchHandler.cs
@@ -9,19 +9,13 @@ public static class JailbirdPatchHandler
         public static string HarmonyName { get; private set; }
         public static void RegisterEvents()
         {
-            if (UsefulHints.Instance.Config.EnableCustomJailbirdSettings)
-            {
-                HarmonyName = $"com-vretu.uh-{DateTime.UtcNow.Ticks}";
-                Harmony = new Harmony(HarmonyName);
-                Harmony.PatchAll();
-            }
+            HarmonyName = $"com-vretu.uh-{DateTime.UtcNow.Ticks}";
+            Harmony = new Harmony(HarmonyName);
+            Harmony.PatchAll();
         }
         public static void UnregisterEvents()
         {
-            if (UsefulHints.Instance.Config.EnableCustomJailbirdSettings)
-            {
-                Harmony.UnpatchAll(HarmonyName);
-            }
+            Harmony.UnpatchAll(HarmonyName);
         }
     }
 }
diff --git a/UsefulHints/UsefulHints.cs b/UsefulHints/UsefulHints.cs
@@ -8,15 +8,15 @@ public class UsefulHints : Plugin<Config>
         public override string Name => "Useful Hints";
         public override string Author => "Vretu";
         public override string Prefix { get; } = "UH";
-        public override Version Version => new Version(1, 4, 0);
+        public override Version Version => new Version(1, 4, 1);
         public override Version RequiredExiledVersion { get; } = new Version(8, 9, 8);
         public static UsefulHints Instance { get; private set; }
         public override void OnEnabled()
         {
             Instance = this;
             if(Config.EnableHints){ EventHandlers.Entities.SCP096.RegisterEvents(); }
             if(Config.EnableHints){ EventHandlers.Items.Hints.RegisterEvents(); }
-            EventHandlers.Modules.JailbirdPatchHandler.RegisterEvents();
+            if(Config.EnableCustomJailbirdSettings){ EventHandlers.Modules.JailbirdPatchHandler.RegisterEvents(); }
             EventHandlers.Modules.KillCounter.RegisterEvents();
             EventHandlers.Modules.LastHumanBroadcast.RegisterEvents();
             EventHandlers.Modules.RoundSummary.RegisterEvents();
@@ -28,7 +28,7 @@ public override void OnDisabled()
             Instance = null;
             if(Config.EnableHints){ EventHandlers.Entities.SCP096.UnregisterEvents(); }
             if(Config.EnableHints){ EventHandlers.Items.Hints.UnregisterEvents(); }
-            EventHandlers.Modules.JailbirdPatchHandler.UnregisterEvents();
+            if(Config.EnableCustomJailbirdSettings) { EventHandlers.Modules.JailbirdPatchHandler.UnregisterEvents(); }
             EventHandlers.Modules.KillCounter.UnregisterEvents();
             EventHandlers.Modules.LastHumanBroadcast.UnregisterEvents();
             EventHandlers.Modules.RoundSummary.UnregisterEvents();