Merge pull request #17 from 18107/master

Fixed operand check and debug output
PULSAR-Modders · Jan 13, 2019 · 8cd1519 · 8cd1519
2 parents cfeaefe + 2c0bf13
commit 8cd1519
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/PulsarPluginLoader/Patches/HarmonyHelpers.cs b/PulsarPluginLoader/Patches/HarmonyHelpers.cs
@@ -20,14 +20,13 @@ public static IEnumerable<CodeInstruction> PatchBySequence(IEnumerable<CodeInstr
 
             for (int i = 0; i < newInstructions.Count; i++)
             {
-                bool startsWithTargetInstruction = newInstructions[i].opcode.Equals(targetStart.opcode);
                 bool targetSequenceStillFits = i + targetSize <= newInstructions.Count;
 
-                if (startsWithTargetInstruction && targetSequenceStillFits)
+                if (targetSequenceStillFits)
                 {
                     bool foundTargetSequence = true;
 
-                    for (int x = 1; x < targetSize && foundTargetSequence; x++)
+                    for (int x = 0; x < targetSize && foundTargetSequence; x++)
                     {
                         foundTargetSequence = newInstructions[i + x].opcode.Equals(targetSequence.ElementAt(x).opcode)
                             && (!checkOperands || (
@@ -56,23 +55,24 @@ public static IEnumerable<CodeInstruction> PatchBySequence(IEnumerable<CodeInstr
 
                         break;
                     }
-                    else if (!targetSequenceStillFits)
-                    {
-                        StringBuilder sb = new StringBuilder();
-
-                        sb.AppendLine($"Failed to patch by sequence: couldn't find target sequence.  This might be okay in certain cases.");
+                }
+                else
+                {
+                    StringBuilder sb = new StringBuilder();
 
-                        // Cut down the stack trace because it's 20 lines of unhelpful reflection internals.
-                        // Show enough to figure out which plugin + transpiler method is causing this:
-                        sb.AppendLine($"Stack Trace:");
-                        string[] stackTrace = new System.Diagnostics.StackTrace().ToString().Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
-                        for (int lineNumber = 0; lineNumber < 2; lineNumber++)
-                        {
-                            sb.AppendLine(stackTrace[lineNumber]);
-                        }
+                    sb.AppendLine($"Failed to patch by sequence: couldn't find target sequence.  This might be okay in certain cases.");
 
-                        Logger.Info(sb.ToString());
+                    // Cut down the stack trace because it's 20 lines of unhelpful reflection internals.
+                    // Show enough to figure out which plugin + transpiler method is causing this:
+                    sb.AppendLine($"Stack Trace:");
+                    string[] stackTrace = new System.Diagnostics.StackTrace().ToString().Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
+                    for (int lineNumber = 0; lineNumber < 2; lineNumber++)
+                    {
+                        sb.AppendLine(stackTrace[lineNumber]);
                     }
+
+                    Logger.Info(sb.ToString());
+                    break;
                 }
             }