From 3f8ef956855d3d5e1b33182ea3591f088e3939c4 Mon Sep 17 00:00:00 2001 From: Tyfon <29051038+tyfon7@users.noreply.github.com> Date: Thu, 22 Aug 2024 12:18:54 -0700 Subject: [PATCH] Disable MergeConsumables compat change until that mod implements Rollback() --- Patches/FixTraderControllerSimulateFalsePatch.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Patches/FixTraderControllerSimulateFalsePatch.cs b/Patches/FixTraderControllerSimulateFalsePatch.cs index df3b855..4621bae 100644 --- a/Patches/FixTraderControllerSimulateFalsePatch.cs +++ b/Patches/FixTraderControllerSimulateFalsePatch.cs @@ -25,10 +25,14 @@ public class FixTraderControllerSimulateFalsePatch : ModulePatch ref ItemOperation __result, bool __runOriginal) { - if (!__runOriginal) - { - return __runOriginal; - } + // TODO: The following commented code is necessary for compatibility with any mod that prefix patches and returns false, + // specifically MergeConsumables. However, that mod currently doesn't implement Rollback() on its operations, + // which breaks multi-select and has very nasty side effects. + // Until that is fixed, leaving this as commented because while this breaks that mod, there are no game-breaking effects. + // if (!__runOriginal) + // { + // return __runOriginal; + // } TargetItemOperation opStruct; opStruct.targetItem = targetItem;