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

stop proxying nulls

This commit is contained in:
Shockah 2022-02-09 21:02:41 +01:00
parent 688fccc024
commit 354527bb81
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/SMAPI/Framework/Reflection/InterfaceProxyBuilder.cs
View File

@ -265,12 +265,24 @@ namespace StardewModdingAPI.Framework.Reflection
}
else
{
// this.Glue.CreateInstanceForProxyTypeName(proxyTypeName, this.Instance.Call(args))
var resultLocal = il.DeclareLocal(typeof(object)); // we store both unmodified and modified in here
EmitCallInstance();
il.Emit(OpCodes.Stloc, resultLocal);
// if (unmodifiedResultLocal == null) jump
var isNullLabel = il.DefineLabel();
il.Emit(OpCodes.Ldloc, resultLocal);
il.Emit(OpCodes.Brfalse, isNullLabel);
il.Emit(OpCodes.Ldarg_0);
il.Emit(OpCodes.Ldfld, glueField);
il.Emit(OpCodes.Ldstr, returnValueProxyTypeName);
EmitCallInstance();
il.Emit(OpCodes.Ldloc, resultLocal);
il.Emit(OpCodes.Call, CreateInstanceForProxyTypeNameMethod);
il.Emit(OpCodes.Stloc, resultLocal);
il.MarkLabel(isNullLabel);
il.Emit(OpCodes.Ldloc, resultLocal);
}
// return result