Added more Comprehensive Exception Message when attempting to use an …

…Instance Patch Method LavaGang#138

CHANGELOG.md

@@ -85,6 +85,7 @@
 58. Switched Coroutine System for Il2Cpp to a Wrapper based Interface.    (Credits to [HookedBehemoth](https://github.com/HookedBehemoth) :D)  
 59. Fixed occasional double-logging issue with MelonLogger.    (Credits to [benaclejames](https://github.com/benaclejames) :D)  
 60. Removed Useless Logger Instance Constructor.
+61. Added more Comprehensive Exception Message when attempting to use an Instance Patch Method.
 
 ---
 

MelonLoader/Core.cs

@@ -22,6 +22,7 @@ private static int Initialize()
             HarmonyInstance = new HarmonyLib.Harmony(BuildInfo.Name);
 
             Fixes.ForcedCultureInfo.Install();
+            Fixes.InstancePatchFix.Install();
             PatchShield.Install();
 
             MelonPreferences.Load();

MelonLoader/Fixes/InstancePatchFix.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Reflection;
+using HarmonyLib;
+using MonoMod.RuntimeDetour;
+
+namespace MelonLoader.Fixes
+{
+    internal static class InstancePatchFix
+    {
+		internal static void Install()
+		{
+			Type instancePatchFixType = typeof(InstancePatchFix);
+			HarmonyMethod patchMethod = AccessTools.Method(instancePatchFixType, "PatchMethod").ToNewHarmonyMethod();
+
+			try
+			{
+				Core.HarmonyInstance.Patch(AccessTools.Method("HarmonyLib.PatchFunctions:ReversePatch"), patchMethod);
+				Core.HarmonyInstance.Patch(AccessTools.Method("HarmonyLib.HarmonyMethod:ImportMethod"), patchMethod);
+			}
+			catch (Exception ex) { MelonLogger.Warning($"PatchFix Exception: {ex}"); }
+
+			Hook.OnDetour += (detour, originalMethod, patchMethod, delegateTarget) => PatchMethod(patchMethod);
+			Detour.OnDetour += (detour, originalMethod, patchMethod) => PatchMethod(patchMethod);
+		}
+
+		private static bool PatchMethod(MethodBase __0)
+        {
+			if (__0 == null)
+				throw new NullReferenceException("Patch Method");
+			if ((__0 != null) && !__0.IsStatic)
+				throw new Exception("Patch Method can't be an Instance Method!");
+			return true;
+		}
+	}
+}

MelonLoader/MelonLoader.csproj

@@ -45,6 +45,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Fixes\ForcedCultureInfo.cs" />
+    <Compile Include="Fixes\InstancePatchFix.cs" />
     <Compile Include="GameVersionHandler.cs" />
     <Compile Include="InternalUtils\MelonStartScreen.cs" />
     <Compile Include="Lemons\LemonAction.cs" />