Merge pull request #81 from Tess-y/main

Fix for onceHooks
Rounds-Modding · Jun 18, 2022 · ebacf25 · ebacf25
2 parents b9027c2 + 20561ce
commit ebacf25
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/UnboundLib/GameModes/GameModeManager.cs b/UnboundLib/GameModes/GameModeManager.cs
@@ -261,38 +261,41 @@ public static void AddOnceHook(string key, Func<IGameModeHandler, IEnumerator> a
 
             if (!onceHooks.ContainsKey(key))
             {
-                onceHooks.Add(key, new List<GameModeHooks.Hook>{ new GameModeHooks.Hook(action, priority) });
+                onceHooks.Add(key, new List<GameModeHooks.Hook>{ AddHook(key, action, priority) });
             }
             else
             {
-                onceHooks[key].Add(new GameModeHooks.Hook(action, priority));
+                onceHooks[key].Add(AddHook(key, action, priority));
             }
 
-            AddHook(key, action);
+
         }
 
         public static void AddHook(string key, Func<IGameModeHandler, IEnumerator> action)
         {
             AddHook(key, action, GameModeHooks.Priority.Normal);
-        }
-        public static void AddHook(string key, Func<IGameModeHandler, IEnumerator> action, int priority)
+        } 
+        public static GameModeHooks.Hook AddHook(string key, Func<IGameModeHandler, IEnumerator> action, int priority)
         {
             if (action == null)
             {
-                return;
+                return null;
             }
 
             // Case-insensitive keys for QoL
             key = key.ToLower();
 
+            GameModeHooks.Hook hook = new GameModeHooks.Hook(action, priority);
+
             if (!hooks.ContainsKey(key))
             {
-                hooks.Add(key, new List<GameModeHooks.Hook> { new GameModeHooks.Hook(action, priority) });
+                hooks.Add(key, new List<GameModeHooks.Hook> { hook });
             }
             else
             {
-                hooks[key].Add(new GameModeHooks.Hook(action, priority));
+                hooks[key].Add(hook);
             }
+            return hook;
         }
         public static void RemoveHook(string key, GameModeHooks.Hook hook)
         {

diff --git a/UnboundLib/Unbound.cs b/UnboundLib/Unbound.cs
@@ -25,7 +25,7 @@ public class Unbound : BaseUnityPlugin
     {
         private const string ModId = "com.willis.rounds.unbound";
         private const string ModName = "Rounds Unbound";
-        public const string Version = "3.1.2";
+        public const string Version = "3.1.3";
 
         public static Unbound Instance { get; private set; }
         public static readonly ConfigFile config = new ConfigFile(Path.Combine(Paths.ConfigPath, "UnboundLib.cfg"), true);

diff --git a/UnboundLib/UnboundLib.csproj b/UnboundLib/UnboundLib.csproj
@@ -33,7 +33,7 @@
     <DebugType>portable</DebugType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <RoundsFolder>C:\Program Files (x86)\Steam\steamapps\common\ROUNDS</RoundsFolder>
     <IndirectBuildTask>true</IndirectBuildTask>
@@ -134,7 +134,7 @@
       <PackageVersion>%(PackAssembly.Version)</PackageVersion>
     </PropertyGroup>
   </Target>
-  
+
   <Target Name="PostBuildTaskWin" Condition="'$(OS)' == 'Windows_NT'" DependsOnTargets="Build" AfterTargets="Build">
     <CallTarget Targets="ReadPackageVersionFromOutputAssembly">
       <Output TaskParameter="TargetOutputs" PropertyName="PackageVersion" />