From ec86f0bee6eb487e511fa1066b0c422d9014a3ed Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sun, 20 Sep 2015 13:40:59 -0400
Subject: [PATCH] Basic multi arith, need to rewrite

---
 src/main/java/net/runelite/deob/Deob.java                    | 5 ++++-
 .../java/net/runelite/deob/attributes/code/Instruction.java  | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/runelite/deob/Deob.java b/src/main/java/net/runelite/deob/Deob.java
index 80e82e0a9e..226e008c05 100644
--- a/src/main/java/net/runelite/deob/Deob.java
+++ b/src/main/java/net/runelite/deob/Deob.java
@@ -26,6 +26,7 @@ import net.runelite.deob.deobfuscators.UnusedFields;
 import net.runelite.deob.deobfuscators.UnusedMethods;
 import net.runelite.deob.deobfuscators.UnusedParameters;
 import net.runelite.deob.deobfuscators.arithmetic.ModArith;
+import net.runelite.deob.deobfuscators.arithmetic.MultiplicationDeobfuscator;
 import net.runelite.deob.execution.Execution;
 
 //move static methods
@@ -86,7 +87,9 @@ public class Deob
 //		
 //		run(group, new UnusedClass());
 		
-		new ModArith().run(group);
+		//new ModArith().run(group);
+		
+		new MultiplicationDeobfuscator().run(group);
 
 		saveJar(group, args[1]);
 		
diff --git a/src/main/java/net/runelite/deob/attributes/code/Instruction.java b/src/main/java/net/runelite/deob/attributes/code/Instruction.java
index 2027330f47..88299f60f2 100644
--- a/src/main/java/net/runelite/deob/attributes/code/Instruction.java
+++ b/src/main/java/net/runelite/deob/attributes/code/Instruction.java
@@ -128,6 +128,9 @@ public abstract class Instruction
 		}
 		from.clear();
 		
+		for (Exception e : instructions.getCode().getExceptions().getExceptions())
+			e.replace(this, next);
+		
 		this.getInstructions().remove(this); // calls remove()
 		
 		return true;