Ensure the root method is used when mapping specialized methods (#459)

FabricMC · Sep 12, 2022 · bfc47f1 · bfc47f1
1 parent 84a9cbd
commit bfc47f1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/enigma-cli/src/main/java/cuchaz/enigma/command/MapSpecializedMethodsCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/MapSpecializedMethodsCommand.java
@@ -1,6 +1,7 @@
 package cuchaz.enigma.command;
 
 import cuchaz.enigma.ProgressListener;
+import cuchaz.enigma.analysis.IndexTreeBuilder;
 import cuchaz.enigma.analysis.index.BridgeMethodIndex;
 import cuchaz.enigma.analysis.index.JarIndex;
 import cuchaz.enigma.classprovider.CachingClassProvider;
@@ -53,6 +54,7 @@ public static void run(Path jar, String sourceFormat, Path sourcePath, String re
 
         BridgeMethodIndex bridgeMethodIndex = jarIndex.getBridgeMethodIndex();
         Translator translator = new MappingTranslator(source, jarIndex.getEntryResolver());
+	    IndexTreeBuilder indexTreeBuilder = new IndexTreeBuilder(jarIndex);
 
         // Copy all non-specialized methods
         for (EntryTreeNode<EntryMapping> node : source) {
@@ -64,7 +66,7 @@ public static void run(Path jar, String sourceFormat, Path sourcePath, String re
         // Add correct mappings for specialized methods
         for (Map.Entry<MethodEntry, MethodEntry> entry : bridgeMethodIndex.getBridgeToSpecialized().entrySet()) {
             MethodEntry bridge = entry.getKey();
-            MethodEntry specialized = entry.getValue();
+            MethodEntry specialized = indexTreeBuilder.buildMethodInheritance(translator, entry.getValue()).getMethodEntry();
             String name = translator.translate(bridge).getName();
             result.insert(specialized, new EntryMapping(name));
         }