diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfACmpEq.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IfACmpEq.java index aa127104ec..811d758c9b 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfACmpEq.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IfACmpEq.java @@ -19,7 +19,7 @@ public class IfACmpEq extends If if (super.isSame(thisIc, otherIc)) return true; - if (otherIc.getInstruction() instanceof IfNull) + if (otherIc.getInstruction() instanceof IfNull || otherIc.getInstruction() instanceof IfNonNull) { StackContext s1 = thisIc.getPops().get(0), s2 = thisIc.getPops().get(1); @@ -44,7 +44,7 @@ public class IfACmpEq extends If @Override public void map(ParallelExecutorMapping mapping, InstructionContext ctx, InstructionContext other) { - if (other.getInstruction() instanceof IfACmpNe) + if (other.getInstruction() instanceof IfACmpNe || other.getInstruction() instanceof IfNonNull) { super.mapOtherBranch(mapping, ctx, other); } diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfEq.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IfEq.java index bb99b79443..75aa94efd1 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfEq.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IfEq.java @@ -24,7 +24,7 @@ public class IfEq extends If0 { return true; } - else if (otherIc.getInstruction() instanceof IfICmpNe) + else if (otherIc.getInstruction() instanceof IfICmpEq || otherIc.getInstruction() instanceof IfICmpNe) { StackContext s1 = otherIc.getPops().get(0), s2 = otherIc.getPops().get(1);