Fix method renaming in the same way

BepInEx · Jan 19, 2024 · dafbc42 · dafbc42
1 parent dbbb257
commit dafbc42
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/Il2CppInterop.Generator/Contexts/MethodRewriteContext.cs b/Il2CppInterop.Generator/Contexts/MethodRewriteContext.cs
@@ -242,9 +242,18 @@ private string UnmangleMethodNameWithSignature()
     {
         var unmangleMethodNameWithSignature = ProduceMethodSignatureBase() + "_" + DeclaringType.Methods
             .Where(ParameterSignatureMatchesThis).TakeWhile(it => it != this).Count();
+
         if (DeclaringType.AssemblyContext.GlobalContext.Options.RenameMap.TryGetValue(
+                DeclaringType.NewType.GetNamespacePrefix() + "." + DeclaringType.NewType.Name + "::" + unmangleMethodNameWithSignature, out var newNameByType))
+        {
+            unmangleMethodNameWithSignature = newNameByType;
+        }
+        else if (DeclaringType.AssemblyContext.GlobalContext.Options.RenameMap.TryGetValue(
                 DeclaringType.NewType.GetNamespacePrefix() + "::" + unmangleMethodNameWithSignature, out var newName))
+        {
             unmangleMethodNameWithSignature = newName;
+        }
+
         return unmangleMethodNameWithSignature;
     }