Fix derp-check in MemberInfo which was using nonsense logic - fixes #242

SpongePowered · Mar 20, 2018 · 086a706 · 086a706
1 parent aece829
commit 086a706
Showing 1 changed file with 6 additions and 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
@@ -443,12 +443,12 @@ public MemberInfo validate() throws InvalidMemberDescriptorException {
             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");
             }
         }