From 032d43d63cc2346972480f3407167d3d339667bd Mon Sep 17 00:00:00 2001 From: zaaarf Date: Fri, 31 Mar 2023 12:56:40 +0200 Subject: fix: ambiguity in mapping member names --- .../ftbsc/lll/processor/tools/obfuscation/ObfuscationMapper.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/ftbsc/lll/processor') diff --git a/src/main/java/ftbsc/lll/processor/tools/obfuscation/ObfuscationMapper.java b/src/main/java/ftbsc/lll/processor/tools/obfuscation/ObfuscationMapper.java index 4fec0b5..7146e00 100644 --- a/src/main/java/ftbsc/lll/processor/tools/obfuscation/ObfuscationMapper.java +++ b/src/main/java/ftbsc/lll/processor/tools/obfuscation/ObfuscationMapper.java @@ -189,7 +189,7 @@ public class ObfuscationMapper { */ public String get(String memberName, String methodDescriptor) { //find all keys that start with the name - List candidates = members.keySet().stream().filter(m -> m.startsWith(memberName)).collect(Collectors.toList()); + List candidates = members.keySet().stream().filter(m -> m.equals(memberName.split(" ")[0])).collect(Collectors.toList()); if(methodDescriptor != null) { String signature = String.format("%s %s", memberName, methodDescriptor); candidates = candidates.stream().filter(m -> m.equals(signature)).collect(Collectors.toList()); @@ -206,10 +206,11 @@ public class ObfuscationMapper { return members.get(candidates.get(0)); default: throw new AmbiguousDefinitionException(String.format( - "Mapper could not uniquely identify member %s.%s%s", + "Mapper could not uniquely identify member %s.%s%s, found %d!", this.unobf, memberName, - methodDescriptor == null ? "" : "()" + methodDescriptor == null ? "" : "()", + candidates.size() )); } } -- cgit v1.2.3-56-ga3b1