From 39c14267e564a4fa70f637486d3b6f29593f28d5 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Thu, 10 Mar 2016 19:56:44 -0500
Subject: [PATCH] Oops.

---
 .../rename/MappingExecutorUtil.java           | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

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 c581dc3c69..699ea1a77f 100644
--- a/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
+++ b/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
@@ -131,26 +131,6 @@ public class MappingExecutorUtil
 
 			mi1.map(mappings, p1, p2);
 			e.paused = e2.paused = false;
-
-			// detect end of handler. this method is only used to map handlers.
-			if (mi1 instanceof SetFieldInstruction && mi2 instanceof SetFieldInstruction)
-			{
-				SetFieldInstruction sfi1 = (SetFieldInstruction) mi1,
-					sfi2 = (SetFieldInstruction) mi2;
-
-				if (sfi1.getMyField().packetHandler && sfi2.getMyField().packetHandler)
-				{
-					Instruction sfii = p1.getPops().get(0).getPushed().getInstruction();
-					if (sfii instanceof PushConstantInstruction)
-					{
-						Object o = ((PushConstantInstruction) sfii).getConstant().getObject();
-						if (o.equals(-1))
-						{
-							break outer;
-						}
-					}
-				}
-			}
 		}
 		
 		return mappings;
@@ -215,6 +195,29 @@ public class MappingExecutorUtil
 
 			mi1.map(mappings, p1, p2);
 			e.paused = e2.paused = false;
+
+
+			// detect end of handler. this method is only used to map handlers.
+			if (mi1 instanceof SetFieldInstruction && mi2 instanceof SetFieldInstruction)
+			{
+				SetFieldInstruction sfi1 = (SetFieldInstruction) mi1,
+					sfi2 = (SetFieldInstruction) mi2;
+
+				if (sfi1.getMyField().packetHandler && sfi2.getMyField().packetHandler)
+				{
+					Instruction sfii = p1.getPops().get(0).getPushed().getInstruction();
+					if (sfii instanceof PushConstantInstruction)
+					{
+						Object o = ((PushConstantInstruction) sfii).getConstant().getObject();
+						if (o.equals(-1))
+						{
+							p1.getFrame().stop();
+							p2.getFrame().stop();
+							e.paused = e2.paused = false;
+						}
+					}
+				}
+			}
 		}
 
 		return mappings;