From 8d022d216bb0e702057f89c046e63a33e4dc67ef Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 27 Mar 2016 19:38:15 -0400 Subject: [PATCH] Map invokespecial on objects that are under java/io --- .../asm/attributes/code/instructions/InvokeSpecial.java | 3 --- .../deob/deobfuscators/rename/MappingExecutorUtil.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java index f36fe4447c..5c88bd983f 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java @@ -253,9 +253,6 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction if (thisMethods.size() != otherMethods.size()) return false; - assert thisMethods.size() == 1; - assert otherMethods.size() == 1; - for (int i = 0; i < thisMethods.size(); ++i) { net.runelite.asm.Method m1 = thisMethods.get(i); 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 0c2738856e..0f1b2f2ea7 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java +++ b/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java @@ -200,7 +200,7 @@ public class MappingExecutorUtil return false; } - if (className.startsWith("java/lang/reflect/")) + if (className.startsWith("java/lang/reflect/") || className.startsWith("java/io/")) return true; if (className.startsWith("java/") || className.startsWith("netscape/") || className.startsWith("javax/"))