zaaarf/lillero-processor
1
0
Fork 0
mirror of https://github.com/zaaarf/lillero-processor.git synced 2024-11-14 17:19:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: ambiguity in mapping member names

Browse source
This commit is contained in:
zaaarf 2023-03-31 12:56:40 +02:00
parent 44cec29b1c
commit 032d43d63c
No known key found for this signature in database
GPG key ID: 82240E075E31FA4C
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/ftbsc/lll/processor/tools/obfuscation/ObfuscationMapper.java
View file

@ -189,7 +189,7 @@ public class ObfuscationMapper {
*/ */
public String get(String memberName, String methodDescriptor) { public String get(String memberName, String methodDescriptor) {
//find all keys that start with the name //find all keys that start with the name
List<String> candidates = members.keySet().stream().filter(m -> m.startsWith(memberName)).collect(Collectors.toList()); List<String> candidates = members.keySet().stream().filter(m -> m.equals(memberName.split(" ")[0])).collect(Collectors.toList());
if(methodDescriptor != null) { if(methodDescriptor != null) {
String signature = String.format("%s %s", memberName, methodDescriptor); String signature = String.format("%s %s", memberName, methodDescriptor);
candidates = candidates.stream().filter(m -> m.equals(signature)).collect(Collectors.toList()); candidates = candidates.stream().filter(m -> m.equals(signature)).collect(Collectors.toList());
@ -206,10 +206,11 @@ public class ObfuscationMapper {
return members.get(candidates.get(0)); return members.get(candidates.get(0));
default: default:
throw new AmbiguousDefinitionException(String.format( 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, this.unobf,
memberName, memberName,
methodDescriptor == null ? "" : "()" methodDescriptor == null ? "" : "()",
candidates.size()
)); ));
} }
} }