From 086a706ec8bf8c17eff846ed3e789a2e96de6908 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 20 Mar 2018 13:40:16 +0000 Subject: [PATCH] Fix derp-check in MemberInfo which was using nonsense logic - fixes #242 --- .../asm/mixin/injection/struct/MemberInfo.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 f56ba77e..d2715d65 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 @@ -443,12 +443,12 @@ public final class MemberInfo { if (!this.owner.matches("(?i)^[\\w\\p{Sc}/]+$")) { throw new InvalidMemberDescriptorException("Invalid owner: " + this.owner); } - try { - if (!this.owner.equals(Type.getType(this.owner).getDescriptor())) { - throw new InvalidMemberDescriptorException("Invalid owner type specified: " + this.owner); - } - } catch (Exception ex) { - throw new InvalidMemberDescriptorException("Invalid owner type specified: " + this.owner); + // We can't detect this situation 100% reliably, but we can take a + // decent stab at it in order to detect really obvious cases where + // the user types a dot instead of a semicolon + if (this.unparsed != null && this.unparsed.lastIndexOf('.') > 0 && this.owner.startsWith("L")) { + throw new InvalidMemberDescriptorException("Malformed owner: " + this.owner + " If you are seeing this message unexpectedly and the" + + " owner appears to be correct, replace the owner descriptor with formal type L" + this.owner + "; to suppress this error"); } }