Fix hook result applying incorrectly

SignatureBeef · SignatureBeef · commit bb3479d52787 · 2024-12-26T09:55:08.000+10:00
diff --git a/ModFramework/Emitters/HookEmitter.cs b/ModFramework/Emitters/HookEmitter.cs
@@ -85,7 +85,8 @@ static TypeDefinition CreateHookEventArgs(TypeDefinition hookType, MethodDefinit
         FieldDefinition resultField = new(ContinueExecutionName, FieldAttributes.Public, resultType);
 
         // if the method has a return type, add a field for it
-        var hasReturnValue = hookDefinition.ReturnType != hookDefinition.Module.TypeSystem.Void;
+        // n.b. this may happen before/after relinking so two Void types may not be equal thus FullName is used
+        var hasReturnValue = hookDefinition.ReturnType.FullName != hookDefinition.Module.TypeSystem.Void.FullName;
         if (hasReturnValue)
         {
             FieldDefinition returnField = new(HookReturnValueName, FieldAttributes.Public, hookDefinition.ReturnType);

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,8 @@ static TypeDefinition CreateHookEventArgs(TypeDefinition hookType, MethodDefinit`
`85`	`85`	`FieldDefinition resultField = new(ContinueExecutionName, FieldAttributes.Public, resultType);`
`86`	`86`
`87`	`87`	`// if the method has a return type, add a field for it`
`88`		`- var hasReturnValue = hookDefinition.ReturnType != hookDefinition.Module.TypeSystem.Void;`
	`88`	`+ // n.b. this may happen before/after relinking so two Void types may not be equal thus FullName is used`
	`89`	`+ var hasReturnValue = hookDefinition.ReturnType.FullName != hookDefinition.Module.TypeSystem.Void.FullName;`
`89`	`90`	`if (hasReturnValue)`
`90`	`91`	`{`
`91`	`92`	`FieldDefinition returnField = new(HookReturnValueName, FieldAttributes.Public, hookDefinition.ReturnType);`