Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix L being dropped from @Shadow's #154

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −10
Open

Fix L being dropped from @Shadow's #154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,16 +883,6 @@ public static MemberInfo parse(final String input, final ISelectorContext contex
if (context != null) {
name = context.remap(name);
}

int lastDotPos = name.lastIndexOf('.');
int semiColonPos = name.indexOf(';');
if (lastDotPos > -1) {
owner = name.substring(0, lastDotPos).replace('.', '/');
name = name.substring(lastDotPos + 1);
} else if (semiColonPos > -1 && name.startsWith("L")) {
owner = name.substring(1, semiColonPos).replace('.', '/');
name = name.substring(semiColonPos + 1);
}

int parenPos = name.indexOf('(');
int colonPos = name.indexOf(':');
Expand All @@ -904,6 +894,16 @@ public static MemberInfo parse(final String input, final ISelectorContext contex
name = name.substring(0, colonPos);
}

int lastDotPos = name.lastIndexOf('.');
int semiColonPos = name.indexOf(';');
if (lastDotPos > -1) {
owner = name.substring(0, lastDotPos).replace('.', '/');
name = name.substring(lastDotPos + 1);
} else if (semiColonPos > -1 && name.startsWith("L")) {
owner = name.substring(1, semiColonPos).replace('.', '/');
name = name.substring(semiColonPos + 1);
}

if ((name.indexOf('/') > -1 || name.indexOf('.') > -1) && owner == null) {
owner = name;
name = "";
Expand Down