ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Don't look for instance methods when mixin method is static and vice-v

Browse Source
This commit is contained in:
Lucwousin
2019-10-31 17:10:13 +01:00
parent e7a1983158
commit 92c674fdff
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
injector-plugin/src/main/java/net/runelite/injector/MixinInjector.java
View File

@@ -525,7 +525,7 @@ public class MixinInjector
String deobMethodName = (String) replaceAnnotation.getElement().getValue(); String deobMethodName = (String) replaceAnnotation.getElement().getValue();
ClassFile deobCf = inject.toDeobClass(cf); ClassFile deobCf = inject.toDeobClass(cf);
Method deobMethod = findDeobMethod(deobCf, deobMethodName, method.getDescriptor()); Method deobMethod = findDeobMethod(deobCf, deobMethodName, method);
if (deobMethod == null) if (deobMethod == null)
{ {
@@ -739,14 +739,16 @@ public class MixinInjector
} }
} }
private Method findDeobMethod(ClassFile deobCf, String deobMethodName, Signature descriptor) private Method findDeobMethod(ClassFile deobCf, String deobMethodName, Method mixinMethod)
throws InjectionException throws InjectionException
{ {
List<Method> matchingMethods = new ArrayList<>(); final Signature descriptor = mixinMethod.getDescriptor();
final List<Method> matchingMethods = new ArrayList<>();
final boolean stat = mixinMethod.isStatic();
for (Method m : deobCf.getMethods()) for (Method m : deobCf.getMethods())
{ {
if (!deobMethodName.equals(m.getName())) if (!deobMethodName.equals(m.getName()) || m.isStatic() != stat)
{ {
continue; continue;
} }
@@ -966,7 +968,7 @@ public class MixinInjector
String hookName = methodHook.getElement().getString(); String hookName = methodHook.getElement().getString();
boolean end = methodHook.getElements().size() == 2 && methodHook.getElements().get(1).getValue().equals(true); boolean end = methodHook.getElements().size() == 2 && methodHook.getElements().get(1).getValue().equals(true);
ClassFile deobCf = inject.toDeobClass(cf); ClassFile deobCf = inject.toDeobClass(cf);
Method targetMethod = findDeobMethod(deobCf, hookName, method.getDescriptor()); Method targetMethod = findDeobMethod(deobCf, hookName, method);
if (targetMethod == null) if (targetMethod == null)
{ {