From 936da28f6acff5409b12d3a2ed217f06c695caae Mon Sep 17 00:00:00 2001 From: Az <56699741+AlchlcDvl@users.noreply.github.com> Date: Mon, 26 Oct 2026 03:38:29 -0400 Subject: [PATCH] actually cache the HarmonyMethod instance instead --- MiraAPI/GameOptions/ModdedOptionsManager.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/MiraAPI/GameOptions/ModdedOptionsManager.cs b/MiraAPI/GameOptions/ModdedOptionsManager.cs index 4bacd115..81fba525 100644 --- a/MiraAPI/GameOptions/ModdedOptionsManager.cs +++ b/MiraAPI/GameOptions/ModdedOptionsManager.cs @@ -36,8 +36,8 @@ public static class ModdedOptionsManager private static readonly MethodInfo OpenSetterPatch = typeof(ModdedOptionsManager) .GetMethods(BindingFlags.Public | BindingFlags.Static) .First(m => m.Name == nameof(PropertySetterPatch) && m.IsGenericMethodDefinition); - private static readonly Dictionary ConcretisedGetters = []; - private static readonly Dictionary ConcretisedSetters = []; + private static readonly Dictionary ConcretisedGetters = []; + private static readonly Dictionary ConcretisedSetters = []; internal static readonly ConditionalWeakTable ListInstanceCache = []; internal static readonly Dictionary CreatedPlayerOptions = []; @@ -180,12 +180,12 @@ public static class ModdedOptionsManager if (!ConcretisedGetters.TryGetValue(propType, out var concreteGetter)) { - concreteGetter = OpenGetterPatch.MakeGenericMethod(propType); + concreteGetter = new(OpenGetterPatch.MakeGenericMethod(propType)); ConcretisedGetters[propType] = concreteGetter; } var getterOriginal = property.GetGetMethod(true)!; - PluginSingleton.Instance.Harmony.Patch(getterOriginal, prefix: new HarmonyMethod(concreteGetter)); + PluginSingleton.Instance.Harmony.Patch(getterOriginal, prefix: concreteGetter); GetterLookups[getterOriginal] = attribute; var setterOriginal = property.GetSetMethod(true); @@ -194,11 +194,11 @@ public static class ModdedOptionsManager { if (!ConcretisedSetters.TryGetValue(propType, out var concreteSetter)) { - concreteSetter = OpenSetterPatch.MakeGenericMethod(propType); + concreteSetter = new(OpenSetterPatch.MakeGenericMethod(propType)); ConcretisedSetters[propType] = concreteSetter; } - PluginSingleton.Instance.Harmony.Patch(setterOriginal, postfix: new HarmonyMethod(concreteSetter)); + PluginSingleton.Instance.Harmony.Patch(setterOriginal, postfix: concreteSetter); SetterLookups[setterOriginal] = attribute; } @@ -303,12 +303,12 @@ public static class ModdedOptionsManager if (!ConcretisedGetters.TryGetValue(listType, out var concreteGetter)) { - concreteGetter = OpenGetterPatch.MakeGenericMethod(listType); + concreteGetter = new(OpenGetterPatch.MakeGenericMethod(listType)); ConcretisedGetters[listType] = concreteGetter; } var getterOriginal = property.GetGetMethod(true)!; - PluginSingleton.Instance.Harmony.Patch(getterOriginal, prefix: new HarmonyMethod(concreteGetter)); + PluginSingleton.Instance.Harmony.Patch(getterOriginal, prefix: concreteGetter); GetterLookups[getterOriginal] = attribute; var setterOriginal = property.GetSetMethod(true); @@ -317,11 +317,11 @@ public static class ModdedOptionsManager { if (!ConcretisedSetters.TryGetValue(listType, out var concreteSetter)) { - concreteSetter = OpenSetterPatch.MakeGenericMethod(listType); + concreteSetter = new(OpenSetterPatch.MakeGenericMethod(listType)); ConcretisedSetters[listType] = concreteSetter; } - PluginSingleton.Instance.Harmony.Patch(setterOriginal, postfix: new HarmonyMethod(concreteSetter)); + PluginSingleton.Instance.Harmony.Patch(setterOriginal, postfix: concreteSetter); SetterLookups[setterOriginal] = attribute; }