Check __runOriginal in ExecutePossibleActions patch, compat fix for MergeConsumables

2024-08-21 10:57:45 -07:00
parent 1f7d2b6f84
commit 0d7ee4de68
1 changed files with 13 additions and 1 deletions
--- a/Patches/FixTraderControllerSimulateFalsePatch.cs
+++ b/Patches/FixTraderControllerSimulateFalsePatch.cs
@@ -16,8 +16,20 @@ public class FixTraderControllerSimulateFalsePatch : ModulePatch
    // Recreating this function to add the comment section, so calling this with simulate = false doesn't break everything
    [PatchPrefix]
    [HarmonyPriority(Priority.Last)]
-    public static bool Prefix(TraderControllerClass __instance, ItemContextAbstractClass itemContext, Item targetItem, bool partialTransferOnly, bool simulate, ref ItemOperation __result)
+    public static bool Prefix(
+        TraderControllerClass __instance,
+        ItemContextAbstractClass itemContext,
+        Item targetItem,
+        bool partialTransferOnly,
+        bool simulate,
+        ref ItemOperation __result,
+        bool __runOriginal)
    {
+        if (!__runOriginal)
+        {
+            return __runOriginal;
+        }
+
        TargetItemOperation opStruct;
        opStruct.targetItem = targetItem;
        opStruct.traderControllerClass = __instance;