Revert targetMethod changes

SubnauticaNitrox · Nov 23, 2023 · 1b2e431 · 1b2e431
1 parent eba67c7
commit 1b2e431
Show file tree

Hide file tree

Showing 214 changed files with 326 additions and 346 deletions.
diff --git a/NitroxPatcher/Patches/Dynamic/ArmsController_Start_Patch.cs b/NitroxPatcher/Patches/Dynamic/ArmsController_Start_Patch.cs
@@ -1,11 +1,11 @@
-using System.Reflection;
+using System.Reflection;
 using NitroxModel.Helper;
 
 namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class ArmsController_Start_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((ArmsController t) => t.Start());
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((ArmsController t) => t.Start());
 
     public static void Postfix(ArmsController __instance)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/ArmsController_Update_Patch.cs b/NitroxPatcher/Patches/Dynamic/ArmsController_Update_Patch.cs
@@ -1,11 +1,11 @@
-using System.Reflection;
+using System.Reflection;
 using NitroxModel.Helper;
 
 namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class ArmsController_Update_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((ArmsController t) => t.Update());
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((ArmsController t) => t.Update());
 
     public static bool Prefix(ArmsController __instance)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/BaseDeconstructable_Deconstruct_Patch.cs b/NitroxPatcher/Patches/Dynamic/BaseDeconstructable_Deconstruct_Patch.cs
@@ -19,7 +19,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class BaseDeconstructable_Deconstruct_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((BaseDeconstructable t) => t.Deconstruct());
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((BaseDeconstructable t) => t.Deconstruct());
 
     private static TemporaryBuildData Temp => BuildingHandler.Main.Temp;
     private static BuildPieceIdentifier cachedPieceIdentifier;

diff --git a/NitroxPatcher/Patches/Dynamic/BaseDeconstructable_DeconstructionAllowed_Patch.cs b/NitroxPatcher/Patches/Dynamic/BaseDeconstructable_DeconstructionAllowed_Patch.cs
@@ -7,7 +7,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class BaseDeconstructable_DeconstructionAllowed_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((BaseDeconstructable t) => t.DeconstructionAllowed(out Reflect.Ref<string>.Field));
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((BaseDeconstructable t) => t.DeconstructionAllowed(out Reflect.Ref<string>.Field));
 
     public static void Postfix(BaseDeconstructable __instance, ref bool __result, ref string reason)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/Base_OnPreDestroy_Patch.cs b/NitroxPatcher/Patches/Dynamic/Base_OnPreDestroy_Patch.cs
@@ -9,7 +9,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 /// </summary>
 public sealed partial class Base_OnPreDestroy_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((Base t) => t.OnPreDestroy());
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((Base t) => t.OnPreDestroy());
 
     public static void Prefix(Base __instance)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/Bed_EnterInUseMode_Patch.cs b/NitroxPatcher/Patches/Dynamic/Bed_EnterInUseMode_Patch.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using NitroxClient.Communication.Abstract;
 using NitroxModel.Core;
 using NitroxModel.Helper;
@@ -8,7 +8,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class Bed_EnterInUseMode_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((Bed t) => t.EnterInUseMode(default(Player)));
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((Bed t) => t.EnterInUseMode(default(Player)));
 
     public static void Postfix()
     {

diff --git a/NitroxPatcher/Patches/Dynamic/Bench_ExitSittingMode_Patch.cs b/NitroxPatcher/Patches/Dynamic/Bench_ExitSittingMode_Patch.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Reflection;
 using NitroxClient.GameLogic;
 using NitroxClient.GameLogic.ChatUI;
@@ -11,7 +11,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class Bench_ExitSittingMode_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((Bench t) => t.ExitSittingMode(default, default));
+    private static readonly MethodInfo TARGET_METHOD = Reflect.Method((Bench t) => t.ExitSittingMode(default, default));
 
     public static void Prefix(ref bool __runOriginal)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/Bench_OnHandClick_Patch.cs b/NitroxPatcher/Patches/Dynamic/Bench_OnHandClick_Patch.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using NitroxClient.GameLogic;
 using NitroxClient.GameLogic.HUD.Components;
 using NitroxClient.GameLogic.Simulation;
@@ -10,7 +10,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class Bench_OnHandClick_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((Bench t) => t.OnHandClick(default(GUIHand)));
+    private static readonly MethodInfo TARGET_METHOD = Reflect.Method((Bench t) => t.OnHandClick(default(GUIHand)));
     private static bool skipPrefix;
 
     public static bool Prefix(Bench __instance, GUIHand hand)

diff --git a/NitroxPatcher/Patches/Dynamic/Bench_OnPlayerDeath_Patch.cs b/NitroxPatcher/Patches/Dynamic/Bench_OnPlayerDeath_Patch.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using NitroxClient.GameLogic;
 using NitroxClient.MonoBehaviours;
 using NitroxModel.DataStructures;
@@ -8,7 +8,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class Bench_OnPlayerDeath_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((Bench t) => t.OnPlayerDeath(default(Player)));
+    private static readonly MethodInfo TARGET_METHOD = Reflect.Method((Bench t) => t.OnPlayerDeath(default(Player)));
 
     public static void Postfix(Bench __instance)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/BreakableResource_BreakIntoResources_Patch.cs b/NitroxPatcher/Patches/Dynamic/BreakableResource_BreakIntoResources_Patch.cs
@@ -8,7 +8,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class BreakableResource_BreakIntoResources_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((BreakableResource t) => t.BreakIntoResources());
+    private static MethodInfo TARGET_METHOD = Reflect.Method((BreakableResource t) => t.BreakIntoResources());
 
     public static void Prefix(BreakableResource __instance)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/BreakableResource_SpawnResourceFromPrefab_Patch.cs b/NitroxPatcher/Patches/Dynamic/BreakableResource_SpawnResourceFromPrefab_Patch.cs
@@ -16,7 +16,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 /// </summary>
 public sealed partial class BreakableResource_SpawnResourceFromPrefab_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = AccessTools.EnumeratorMoveNext(Reflect.Method(() => BreakableResource.SpawnResourceFromPrefab(default, default, default)));
+    public static readonly MethodInfo TARGET_METHOD = AccessTools.EnumeratorMoveNext(Reflect.Method(() => BreakableResource.SpawnResourceFromPrefab(default, default, default)));
 
     private static readonly InstructionsPattern SpawnResFromPrefPattern = new()
     {

diff --git a/NitroxPatcher/Patches/Dynamic/BuilderTool_Construct_Patch.cs b/NitroxPatcher/Patches/Dynamic/BuilderTool_Construct_Patch.cs
@@ -8,7 +8,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class BuilderTool_Construct_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((BuilderTool t) => t.Construct(default, default, default));
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((BuilderTool t) => t.Construct(default, default, default));
 
     public static bool Prefix(Constructable c)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/Builder_TryPlace_Patch.cs b/NitroxPatcher/Patches/Dynamic/Builder_TryPlace_Patch.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Reflection;
 using HarmonyLib;
@@ -18,7 +17,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class Builder_TryPlace_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method(() => Builder.TryPlace());
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method(() => Builder.TryPlace());
 
     public static readonly InstructionsPattern AddInstructionPattern1 = new()
     {
@@ -44,16 +43,11 @@ public sealed partial class Builder_TryPlace_Patch : NitroxPatch, IDynamicPatch
         { new() { OpCode = Callvirt, Operand = new(nameof(Constructable), nameof(Constructable.SetIsInside)) }, "Insert2" }
     };
 
-    public static List<CodeInstruction> InstructionsToAdd2;
-
-    public Builder_TryPlace_Patch()
+    public static readonly List<CodeInstruction> InstructionsToAdd2 = new()
     {
-        InstructionsToAdd2 = new()
-        {
-            targetMethod.Ldloc<Constructable>(),
-            new(Call, Reflect.Method(() => GhostCreated(default)))
-        };
-    }
+        TARGET_METHOD.Ldloc<Constructable>(),
+        new(Call, Reflect.Method(() => GhostCreated(default)))
+    };
 
     public static IEnumerable<CodeInstruction> Transpiler(MethodBase original, IEnumerable<CodeInstruction> instructions) =>
         instructions.Transform(AddInstructionPattern1, (label, instruction) =>

diff --git a/NitroxPatcher/Patches/Dynamic/Builder_Update_Patch.cs b/NitroxPatcher/Patches/Dynamic/Builder_Update_Patch.cs
@@ -13,7 +13,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 /// </summary>
 public sealed partial class Builder_Update_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method(() => Builder.Update());
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method(() => Builder.Update());
     private static readonly Color DESYNCED_COLOR = Color.magenta;
 
     public static void Postfix()

diff --git a/NitroxPatcher/Patches/Dynamic/ConstructableBase_SetState_Patch.cs b/NitroxPatcher/Patches/Dynamic/ConstructableBase_SetState_Patch.cs
@@ -13,7 +13,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class ConstructableBase_SetState_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((ConstructableBase t) => t.SetState(default, default));
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((ConstructableBase t) => t.SetState(default, default));
 
     /*
      * Make it become
@@ -29,16 +29,11 @@ public sealed partial class ConstructableBase_SetState_Patch : NitroxPatch, IDyn
         { Brfalse, "Insert" }
     };
 
-    public static List<CodeInstruction> InstructionsToAdd;
-    public ConstructableBase_SetState_Patch()
+    public static readonly List<CodeInstruction> InstructionsToAdd = new()
     {
-        InstructionsToAdd = new()
-        {
-            targetMethod.Ldloc<GameObject>(),
-            new(Call, Reflect.Method(() => BeforeDestroy(default)))
-        };
-
-    }
+        TARGET_METHOD.Ldloc<GameObject>(),
+        new(Call, Reflect.Method(() => BeforeDestroy(default)))
+    };
 
     public static IEnumerable<CodeInstruction> Transpiler(MethodBase original, IEnumerable<CodeInstruction> instructions) =>
         instructions.Transform(InstructionPattern, (label, instruction) =>

diff --git a/NitroxPatcher/Patches/Dynamic/Constructable_Construct_Patch.cs b/NitroxPatcher/Patches/Dynamic/Constructable_Construct_Patch.cs
@@ -25,7 +25,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class Constructable_Construct_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((Constructable t) => t.Construct());
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((Constructable t) => t.Construct());
 
     private static TemporaryBuildData Temp => BuildingHandler.Main.Temp;
 

diff --git a/NitroxPatcher/Patches/Dynamic/Constructable_DeconstructAsync_Patch.cs b/NitroxPatcher/Patches/Dynamic/Constructable_DeconstructAsync_Patch.cs
@@ -9,7 +9,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class Constructable_DeconstructAsync_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = AccessTools.EnumeratorMoveNext(Reflect.Method((Constructable t) => t.DeconstructAsync(default, default)));
+    public static readonly MethodInfo TARGET_METHOD = AccessTools.EnumeratorMoveNext(Reflect.Method((Constructable t) => t.DeconstructAsync(default, default)));
 
     public static readonly InstructionsPattern InstructionsPattern = new()
     {

diff --git a/NitroxPatcher/Patches/Dynamic/Constructable_DeconstructionAllowed_Patch.cs b/NitroxPatcher/Patches/Dynamic/Constructable_DeconstructionAllowed_Patch.cs
@@ -13,7 +13,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 /// </summary>
 public sealed partial class Constructable_DeconstructionAllowed_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((Constructable t) => t.DeconstructionAllowed(out Reflect.Ref<string>.Field));
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((Constructable t) => t.DeconstructionAllowed(out Reflect.Ref<string>.Field));
 
     public static void Postfix(Constructable __instance, ref bool __result, ref string reason)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/ConstructorInput_OnCraftingBegin_Patch.cs b/NitroxPatcher/Patches/Dynamic/ConstructorInput_OnCraftingBegin_Patch.cs
@@ -11,8 +11,7 @@ namespace NitroxPatcher.Patches.Dynamic
 {
     public sealed partial class ConstructorInput_OnCraftingBegin_Patch : NitroxPatch, IDynamicPatch
     {
-        private static readonly Type TARGET_TYPE = typeof(ConstructorInput);
-        public override MethodInfo targetMethod { get; } = AccessTools.EnumeratorMoveNext(Reflect.Method((ConstructorInput t) => t.OnCraftingBeginAsync(default(TechType), default(float))));
+        public static readonly MethodInfo TARGET_METHOD = AccessTools.EnumeratorMoveNext(Reflect.Method((ConstructorInput t) => t.OnCraftingBeginAsync(default(TechType), default(float))));
 
         public static readonly OpCode INJECTION_OPCODE = OpCodes.Call;
         public static readonly object INJECTION_OPERAND = Reflect.Method(() => CrafterLogic.NotifyCraftEnd(default(GameObject), default(TechType)));
@@ -33,9 +32,9 @@ public static IEnumerable<CodeInstruction> Transpiler(MethodBase original, IEnum
                     yield return original.Ldloc<ConstructorInput>(0);
                     yield return original.Ldloc<GameObject>(0);
                     yield return new CodeInstruction(OpCodes.Ldarg_0);
-                    yield return new CodeInstruction(OpCodes.Ldfld, TARGET_TYPE.GetField("techType", BindingFlags.Instance | BindingFlags.Public));
+                    yield return new CodeInstruction(OpCodes.Ldfld, TARGET_METHOD.DeclaringType.GetField("techType", BindingFlags.Instance | BindingFlags.Public));
                     yield return new CodeInstruction(OpCodes.Ldarg_0);
-                    yield return new CodeInstruction(OpCodes.Ldfld, TARGET_TYPE.GetField("duration", BindingFlags.Instance | BindingFlags.Public));
+                    yield return new CodeInstruction(OpCodes.Ldfld, TARGET_METHOD.DeclaringType.GetField("duration", BindingFlags.Instance | BindingFlags.Public));
                     yield return new CodeInstruction(OpCodes.Call, ((Action<ConstructorInput, GameObject, TechType, float>)Callback).Method);
                 }
             }

diff --git a/NitroxPatcher/Patches/Dynamic/Constructor_Deploy_Patch.cs b/NitroxPatcher/Patches/Dynamic/Constructor_Deploy_Patch.cs
@@ -7,7 +7,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class Constructor_Deploy_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((Constructor t) => t.Deploy(default(bool)));
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((Constructor t) => t.Deploy(default(bool)));
 
     public static void Prefix(Constructor __instance, bool value)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/CrafterLogic_TryPickupSingleAsync_Patch.cs b/NitroxPatcher/Patches/Dynamic/CrafterLogic_TryPickupSingleAsync_Patch.cs
@@ -17,7 +17,7 @@ namespace NitroxPatcher.Patches.Dynamic;
  */
 public sealed partial class CrafterLogic_TryPickupSingleAsync_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = AccessTools.EnumeratorMoveNext(Reflect.Method((CrafterLogic t) => t.TryPickupSingleAsync(default(TechType), default(IOut<bool>))));
+    public static readonly MethodInfo TARGET_METHOD = AccessTools.EnumeratorMoveNext(Reflect.Method((CrafterLogic t) => t.TryPickupSingleAsync(default(TechType), default(IOut<bool>))));
 
     public static readonly OpCode INJECTION_OPCODE = OpCodes.Call;
     public static readonly object INJECTION_OPERAND = Reflect.Method(() => CrafterLogic.NotifyCraftEnd(default(GameObject), default(TechType)));

diff --git a/NitroxPatcher/Patches/Dynamic/CrashHome_Spawn_Patch.cs b/NitroxPatcher/Patches/Dynamic/CrashHome_Spawn_Patch.cs
@@ -1,11 +1,11 @@
-using System.Reflection;
+using System.Reflection;
 using NitroxModel.Helper;
 
 namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class CrashHome_Spawn_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((CrashHome t) => t.Spawn());
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((CrashHome t) => t.Spawn());
 
     public static bool Prefix() // Disables Crashfish automatic spawning on the client
     {

diff --git a/NitroxPatcher/Patches/Dynamic/Creature_ChooseBestAction_Patch.cs b/NitroxPatcher/Patches/Dynamic/Creature_ChooseBestAction_Patch.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using NitroxClient.GameLogic;
 using NitroxClient.Unity.Helper;
 using NitroxModel.DataStructures;
@@ -8,7 +8,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class Creature_ChooseBestAction_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((Creature t) => t.ChooseBestAction(default(float)));
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((Creature t) => t.ChooseBestAction(default(float)));
 
     private static CreatureAction previousAction;
 

diff --git a/NitroxPatcher/Patches/Dynamic/CyclopsDamagePoint_OnRepair_Patch.cs b/NitroxPatcher/Patches/Dynamic/CyclopsDamagePoint_OnRepair_Patch.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using NitroxClient.GameLogic;
 using NitroxModel.Helper;
 
@@ -10,7 +10,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 /// </summary>
 public sealed partial class CyclopsDamagePoint_OnRepair_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((CyclopsDamagePoint t) => t.OnRepair());
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((CyclopsDamagePoint t) => t.OnRepair());
 
     public static void Postfix(CyclopsDamagePoint __instance)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/CyclopsDecoyLaunchButton_OnClick_Patch.cs b/NitroxPatcher/Patches/Dynamic/CyclopsDecoyLaunchButton_OnClick_Patch.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using NitroxClient.GameLogic;
 using NitroxModel.Core;
 using NitroxModel.DataStructures;
@@ -8,7 +8,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class CyclopsDecoyLaunchButton_OnClick_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((CyclopsDecoyLaunchButton t) => t.OnClick());
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((CyclopsDecoyLaunchButton t) => t.OnClick());
 
     public static void Postfix(CyclopsHornButton __instance)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/CyclopsDestructionEvent_DestroyCyclops_Patch.cs b/NitroxPatcher/Patches/Dynamic/CyclopsDestructionEvent_DestroyCyclops_Patch.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using NitroxClient.GameLogic;
 using NitroxClient.GameLogic.PlayerLogic;
 using NitroxModel.DataStructures;
@@ -8,7 +8,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class CyclopsDestructionEvent_DestroyCyclops_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((CyclopsDestructionEvent t) => t.DestroyCyclops());
+    private static readonly MethodInfo TARGET_METHOD = Reflect.Method((CyclopsDestructionEvent t) => t.DestroyCyclops());
 
     public static void Prefix(CyclopsDestructionEvent __instance)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/CyclopsEngineChangeState_OnClick_Patch.cs b/NitroxPatcher/Patches/Dynamic/CyclopsEngineChangeState_OnClick_Patch.cs
@@ -7,7 +7,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class CyclopsEngineChangeState_OnClick_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((CyclopsEngineChangeState t) => t.OnClick());
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((CyclopsEngineChangeState t) => t.OnClick());
 
     public static void Postfix(CyclopsEngineChangeState __instance)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/CyclopsExternalDamageManager_CreatePoint_Patch.cs b/NitroxPatcher/Patches/Dynamic/CyclopsExternalDamageManager_CreatePoint_Patch.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using NitroxClient.GameLogic;
 using NitroxModel.DataStructures;
 using NitroxModel.Helper;
@@ -7,7 +7,7 @@ namespace NitroxPatcher.Patches.Dynamic;
 
 public sealed partial class CyclopsExternalDamageManager_CreatePoint_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((CyclopsExternalDamageManager t) => t.CreatePoint());
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((CyclopsExternalDamageManager t) => t.CreatePoint());
 
     public static bool Prefix(CyclopsExternalDamageManager __instance, out bool __state)
     {

diff --git a/NitroxPatcher/Patches/Dynamic/CyclopsFireSuppressionButton_StartCooldown_Patch.cs b/NitroxPatcher/Patches/Dynamic/CyclopsFireSuppressionButton_StartCooldown_Patch.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using NitroxClient.GameLogic;
 using NitroxModel.Core;
 using NitroxModel.DataStructures;
@@ -12,7 +12,7 @@ namespace NitroxPatcher.Patches.Dynamic;
  */
 public sealed partial class CyclopsFireSuppressionButton_StartCooldown_Patch : NitroxPatch, IDynamicPatch
 {
-    public override MethodInfo targetMethod { get; } = Reflect.Method((CyclopsFireSuppressionSystemButton t) => t.StartCooldown());
+    public static readonly MethodInfo TARGET_METHOD = Reflect.Method((CyclopsFireSuppressionSystemButton t) => t.StartCooldown());
 
     public static void Postfix(CyclopsFireSuppressionSystemButton __instance)
     {