From d130a2fb4f4b8b4994e851c9ce5b42c4cd806f0d Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Thu, 10 Mar 2016 18:02:56 -0500
Subject: [PATCH] Hack to make packet mapping stop at the end of the packet
 handler

---
 .../rename/MappingExecutorUtil.java           | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

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 a5f7fa2c92..c581dc3c69 100644
--- a/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
+++ b/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
@@ -12,6 +12,7 @@ import net.runelite.deob.attributes.code.instruction.types.DupInstruction;
 import net.runelite.deob.attributes.code.instruction.types.InvokeInstruction;
 import net.runelite.deob.attributes.code.instruction.types.LVTInstruction;
 import net.runelite.deob.attributes.code.instruction.types.MappableInstruction;
+import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction;
 import net.runelite.deob.attributes.code.instruction.types.ReturnInstruction;
 import net.runelite.deob.attributes.code.instruction.types.SetFieldInstruction;
 import net.runelite.deob.attributes.code.instructions.AALoad;
@@ -98,7 +99,8 @@ public class MappingExecutorUtil
 		mappings.m2 = m2;
 		
 		parallel.mappings = mappings;
-		
+
+		outer:
 		while (parallel.step())
 		{
 			// get what each frame is paused/exited on
@@ -129,6 +131,26 @@ 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;