diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index e569bdd7..2ec444b7 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -362,7 +362,7 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { MethodData obfMethod = obfMethodData.get(targetEnv.getType()); if (obfMethod != null) { - MemberInfo remappedReference = context.remapUsing(obfMethod, false); + MemberInfo remappedReference = context.remapUsing(obfMethod, true); targetEnv.addMapping(className, reference, remappedReference.toString()); } } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index 206aa467..753500cd 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -186,8 +186,8 @@ public class MemberInfo { int slashPos = methodData.name.lastIndexOf('/'); this.owner = setOwner ? methodData.name.substring(0, slashPos) : remapped.owner; this.name = methodData.name.substring(slashPos + 1); - this.desc = remapped.desc; - this.matchAll = false; + this.desc = methodData.sig; + this.matchAll = remapped.matchAll; } /* (non-Javadoc) @@ -294,7 +294,12 @@ public class MemberInfo { } String retString = this.desc.substring(this.desc.indexOf(')') + 1); - if (!retString.equals(Type.getType(retString).getDescriptor())) { + try { + Type retType = Type.getType(retString); + if (!retString.equals(retType.getDescriptor())) { + throw new InvalidMemberDescriptorException("Invalid return type \"" + retString + "\" in descriptor: " + this.desc); + } + } catch (Exception ex) { throw new InvalidMemberDescriptorException("Invalid return type \"" + retString + "\" in descriptor: " + this.desc); } }