Merge pull request #38 from NSGolova/main

Virtualizing overloaded methods with in params causes issues
beat-forge · Mar 25, 2024 · d4dd020 · d4dd020
2 parents 4bf2230 + 5f3425b
commit d4dd020
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/GenericStripper/Modules/BeatSaber/BSAssemblyModule.cs b/GenericStripper/Modules/BeatSaber/BSAssemblyModule.cs
@@ -53,17 +53,23 @@ private void VirtualizeType(TypeDefinition type)
 
         foreach (var subType in type.NestedTypes) VirtualizeType(subType);
 
-        foreach (var m in type.Methods.Where(m => m.IsManaged && m is
+        foreach (var group in type.Methods.Where(m => m.IsManaged && m is
                  {
                      IsIL: true, IsStatic: false, IsVirtual: false, IsAbstract: false, IsAddOn: false,
                      IsConstructor: false, IsSpecialName: false, IsGenericInstance: false, HasOverrides: false
-                 }))
+                 }).GroupBy(m => m.Name))
         {
-            m.IsVirtual = !m.IsPrivate || m.Parameters.FirstOrDefault(p => p.IsIn) == null;
-            m.IsPublic = true;
-            m.IsPrivate = false;
-            m.IsNewSlot = true;
-            m.IsHideBySig = true;
+            foreach (var m in group)
+            {
+                bool hasAnyInParam = m.Parameters.FirstOrDefault(p => p.IsIn) != null;
+                if (group.Count() > 1 && hasAnyInParam) continue;
+
+                m.IsVirtual = !m.IsPrivate || !hasAnyInParam;
+                m.IsPublic = true;
+                m.IsPrivate = false;
+                m.IsNewSlot = true;
+                m.IsHideBySig = true;
+            }
         }
 
         foreach (var field in type.Fields.Where(field => field.IsPrivate)) field.IsFamily = true;