From c8d29e3be4f99a508285c83e5770e9f4515f135b Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Fri, 29 Jan 2016 21:52:39 -0500
Subject: [PATCH] Should be looking up all methods in invokevirtual, not just
 based off of the pool method and up. With test=true this fails on the
 constructor inlined constant value obfuscation.

---
 .../code/instructions/InvokeVirtual.java      | 25 ++++++++++++++-----
 .../rename/MappingExecutorUtil.java           |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java
index df5d24b787..a9269f6495 100644
--- a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java
+++ b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java
@@ -21,8 +21,9 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
-import net.runelite.deob.attributes.code.instruction.types.MappableInstruction;
+import java.util.Set;
 import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
 import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
 import net.runelite.deob.execution.Execution;
@@ -113,14 +114,25 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction
 		return myMethods != null ? myMethods : Arrays.asList();
 	}
 	
-	private void findMethodFromClass(List<net.runelite.deob.Method> list, ClassFile clazz)
+	private void findMethodFromClass(Set<ClassFile> visited, List<net.runelite.deob.Method> list, ClassFile clazz)
 	{
-		net.runelite.deob.Method m = clazz.findMethodDeep(method.getNameAndType());
+		if (visited.contains(clazz))
+			return;
+		visited.add(clazz);
+		
+		ClassFile parent = clazz.getParent();
+		if (parent != null)
+			findMethodFromClass(visited, list, parent);
+		
+		for (ClassFile cf : clazz.getInterfaces().getMyInterfaces())
+			findMethodFromClass(visited, list, cf);
+		
+		net.runelite.deob.Method m = clazz.findMethod(method.getNameAndType());
 		if (m != null && !list.contains(m))
 			list.add(m);
 	
 		for (ClassFile cf : clazz.getChildren())
-			findMethodFromClass(list, cf);
+			findMethodFromClass(visited, list, cf);
 	}
 	
 	@Override
@@ -152,9 +164,10 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction
 		if (otherClass == null)
 			return; // not our class
 		
-		// look up this method in this class and anything that inherits from it
+		// when I recompile classes I can see the class of invokevirtuals methods change, get all methods
+		
 		List<net.runelite.deob.Method> list = new ArrayList<>();
-		findMethodFromClass(list, otherClass);
+		findMethodFromClass(new HashSet<>(), list, otherClass);
 		myMethods = list;
 	}
 	
diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java b/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
index d537daffca..486b377b5e 100644
--- a/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
+++ b/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
@@ -120,7 +120,7 @@ public class MappingExecutorUtil
 		net.runelite.deob.pool.Method m = (net.runelite.deob.pool.Method) ii.getMethod();
 		String className = m.getClassEntry().getName();
 		
-		if (className.startsWith("java/"))
+		if (className.startsWith("java/") || className.startsWith("netscape/"))
 			return false;
 		
 		return true;