StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix: make it possible for multi patch(When one patch replace an instruction, another patch didn't aware it due to the variable capture)

This commit is contained in:
ZaneYork 2020-05-29 14:25:01 +08:00
parent 01b6e4ac32
commit f817039a3a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
View File

@ -4,6 +4,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using Mono.Cecil; using Mono.Cecil;
using Mono.Cecil.Cil;
using StardewModdingAPI.Framework.Exceptions; using StardewModdingAPI.Framework.Exceptions;
using StardewModdingAPI.Framework.ModLoading.Framework; using StardewModdingAPI.Framework.ModLoading.Framework;
using StardewModdingAPI.Metadata; using StardewModdingAPI.Metadata;
@ -304,7 +305,7 @@ namespace StardewModdingAPI.Framework.ModLoading
rewritten |= handler.Handle(module, type, replaceWith); rewritten |= handler.Handle(module, type, replaceWith);
return rewritten; return rewritten;
}, },
rewriteInstruction: (instruction, cil, replaceWith) => rewriteInstruction: (ref Instruction instruction, ILProcessor cil, Action<Instruction> replaceWith) =>
{ {
bool rewritten = false; bool rewritten = false;
foreach (IInstructionHandler handler in handlers) foreach (IInstructionHandler handler in handlers)

4
src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs
View File

@ -23,7 +23,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
/// <param name="cil">The CIL instruction processor.</param> /// <param name="cil">The CIL instruction processor.</param>
/// <param name="replaceWith">Replaces the CIL instruction with the given instruction.</param> /// <param name="replaceWith">Replaces the CIL instruction with the given instruction.</param>
/// <returns>Returns whether the instruction was changed.</returns> /// <returns>Returns whether the instruction was changed.</returns>
public delegate bool RewriteInstructionDelegate(Instruction instruction, ILProcessor cil, Action<Instruction> replaceWith); public delegate bool RewriteInstructionDelegate(ref Instruction instruction, ILProcessor cil, Action<Instruction> replaceWith);
/********* /*********
@ -144,7 +144,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
// instruction itself // instruction itself
// (should be done after the above type rewrites to ensure valid types) // (should be done after the above type rewrites to ensure valid types)
rewritten |= this.RewriteInstructionImpl(instruction, cil, newInstruction => rewritten |= this.RewriteInstructionImpl(ref instruction, cil, newInstruction =>
{ {
rewritten = true; rewritten = true;
cil.Replace(instruction, newInstruction); cil.Replace(instruction, newInstruction);