More MergeConsumables compat - allow swap/stack

2024-08-31 10:18:21 -07:00
parent d733820021
commit a61f0f8156
2 changed files with 18 additions and 1 deletions
--- a/Patches/FixTraderControllerSimulateFalsePatch.cs
+++ b/Patches/FixTraderControllerSimulateFalsePatch.cs
@@ -27,7 +27,12 @@ public class FixTraderControllerSimulateFalsePatch : ModulePatch
    {
        if (!__runOriginal)
        {
-            return __runOriginal;
+            // This is a little hairy, as *some* prefix didn't want to run. If MergeConsumables is present, assume it's that.
+            // If MC succeeded, bail out. If it failed, we might still want to swap
+            if (Plugin.MergeConsumablesPresent() && __result.Succeeded)
+            {
+                return __runOriginal;
+            }
        }

        TargetItemOperation opStruct;