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

Oops.

Browse Source
This commit is contained in:
Adam
2016-03-10 19:56:44 -05:00
parent 575deaf992
commit 39c14267e5
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,26 +131,6 @@ public class MappingExecutorUtil
mi1.map(mappings, p1, p2); mi1.map(mappings, p1, p2);
e.paused = e2.paused = false; 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; return mappings;
@@ -215,6 +195,29 @@ public class MappingExecutorUtil
mi1.map(mappings, p1, p2); mi1.map(mappings, p1, p2);
e.paused = e2.paused = false; 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; return mappings;