Il2CppInteropUtils support for generic methods

BepInEx · Mar 4, 2023 · 24f29f6 · 24f29f6
1 parent 20bc6ba
commit 24f29f6
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Il2CppInterop.Common/Il2CppInteropUtils.cs b/Il2CppInterop.Common/Il2CppInteropUtils.cs
@@ -13,9 +13,14 @@ public static class Il2CppInteropUtils
         foreach (var (opCode, opArg) in MiniIlParser.Decode(body.GetILAsByteArray()))
         {
             if (opCode != OpCodes.Ldsfld) continue;
-            var fieldInfo = methodModule.ResolveField((int)opArg);
-            if (fieldInfo?.FieldType != typeof(IntPtr) || !fieldInfo.Name.StartsWith(prefix)) continue;
-            return fieldInfo;
+
+            var fieldInfo = methodModule.ResolveField((int)opArg, method.DeclaringType.GenericTypeArguments, method.GetGenericArguments());
+            if (fieldInfo?.FieldType != typeof(IntPtr)) continue;
+
+            if (fieldInfo.Name.StartsWith(prefix)) return fieldInfo;
+
+            // Resolve generic method info pointer fields
+            if (method.IsGenericMethod && fieldInfo.DeclaringType.Name.StartsWith("MethodInfoStoreGeneric_") && fieldInfo.Name == "Pointer") return fieldInfo;
         }
 
         return null;