ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Require frames to be crashed too to not map, adds +100

Browse Source
This commit is contained in:
Adam
2016-02-13 18:48:43 -05:00
parent bcc74c6256
commit 71e0a6d996
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
View File

@@ -121,6 +121,7 @@ public class MappingExecutorUtil
if (!mi1.isSame(p1, p2)) if (!mi1.isSame(p1, p2))
{ {
mappings.crashed = true;
p1.getFrame().stop(); p1.getFrame().stop();
p2.getFrame().stop(); p2.getFrame().stop();
e.paused = e2.paused = false; e.paused = e2.paused = false;

1
src/main/java/net/runelite/deob/deobfuscators/rename/ParallelExecutorMapping.java
View File

@@ -14,6 +14,7 @@ public class ParallelExecutorMapping
private Map<Object, Object> map = new HashMap<>(); private Map<Object, Object> map = new HashMap<>();
//private List<Object> order = new ArrayList<>(); //private List<Object> order = new ArrayList<>();
public Method m1, m2; public Method m1, m2;
public boolean crashed;
public ParallelExecutorMapping(ClassGroup group, ClassGroup group2) public ParallelExecutorMapping(ClassGroup group, ClassGroup group2)
{ {

2
src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java
View File

@@ -408,7 +408,7 @@ public class MapStaticTest
ParallelExecutorMapping mappings = MappingExecutorUtil.map(m1, m2); ParallelExecutorMapping mappings = MappingExecutorUtil.map(m1, m2);
if (mappings.getMap().isEmpty()) if (mappings.getMap().isEmpty() && mappings.crashed)
return; return;
mappings.map(m1, m2); mappings.map(m1, m2);