From 71e0a6d996ad113073c051f725cfdacdd3c325d1 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sat, 13 Feb 2016 18:48:43 -0500
Subject: [PATCH] Require frames to be crashed too to not map, adds +100

---
 .../runelite/deob/deobfuscators/rename/MappingExecutorUtil.java | 1 +
 .../deob/deobfuscators/rename/ParallelExecutorMapping.java      | 1 +
 .../net/runelite/deob/deobfuscators/rename/MapStaticTest.java   | 2 +-
 3 files changed, 3 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 13b4b2d579..0679be9343 100644
--- a/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
+++ b/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
@@ -121,6 +121,7 @@ public class MappingExecutorUtil
 			
 			if (!mi1.isSame(p1, p2))
 			{
+				mappings.crashed = true;
 				p1.getFrame().stop();
 				p2.getFrame().stop();
 				e.paused = e2.paused = false;
diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/ParallelExecutorMapping.java b/src/main/java/net/runelite/deob/deobfuscators/rename/ParallelExecutorMapping.java
index 6a894ef626..47a9f20bf9 100644
--- a/src/main/java/net/runelite/deob/deobfuscators/rename/ParallelExecutorMapping.java
+++ b/src/main/java/net/runelite/deob/deobfuscators/rename/ParallelExecutorMapping.java
@@ -14,6 +14,7 @@ public class ParallelExecutorMapping
 	private Map<Object, Object> map = new HashMap<>();
 	//private List<Object> order = new ArrayList<>();
 	public Method m1, m2;
+	public boolean crashed;
 	
 	public ParallelExecutorMapping(ClassGroup group, ClassGroup group2)
 	{
diff --git a/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java b/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java
index 38af52768b..332299b83b 100644
--- a/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java
+++ b/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java
@@ -408,7 +408,7 @@ public class MapStaticTest
 		
 		ParallelExecutorMapping mappings = MappingExecutorUtil.map(m1, m2);
 		
-		if (mappings.getMap().isEmpty())
+		if (mappings.getMap().isEmpty() && mappings.crashed)
 			return;
 		
 		mappings.map(m1, m2);