From cb0a407425b97d9aa299354cf371bf2a28884076 Mon Sep 17 00:00:00 2001 From: bbradson <76005458+bbradson@users.noreply.github.com> Date: Thu, 27 Oct 2022 23:27:39 +0200 Subject: [PATCH] actual fix for mech gestators this time --- 1.4/Assemblies/PerformanceFish.dll | Bin 194048 -> 194048 bytes .../JobSystem/WorkGiver_DoBillOptimization.cs | 8 ++++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/1.4/Assemblies/PerformanceFish.dll b/1.4/Assemblies/PerformanceFish.dll index aae97d64bf04c44f61bf3b6d711c16d20b44ecae..deecc4859c05585bec4f29f8e99569264e98ad09 100644 GIT binary patch delta 7838 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 Vhc?N-fV^>Fz45+$SE}x%{Xa)8zApd( diff --git a/Source/PerformanceFish/JobSystem/WorkGiver_DoBillOptimization.cs b/Source/PerformanceFish/JobSystem/WorkGiver_DoBillOptimization.cs index 8976557..a75348d 100644 --- a/Source/PerformanceFish/JobSystem/WorkGiver_DoBillOptimization.cs +++ b/Source/PerformanceFish/JobSystem/WorkGiver_DoBillOptimization.cs @@ -51,6 +51,9 @@ public class WorkGiver_DoBillOptimization : ClassWithFishPatches var bill = thingValidator.Bill; if (HasNoFilters(bill) // apparently applies to a rim reborn benches? +#if V1_4 + || bill.billStack?.billGiver is Building_MechGestator +#endif || (BlackListedModExtensions.Exists(b => b != null) && IsBlackListed(bill))) // <-- Fuck these too { list = GetDefaultList(r); @@ -401,11 +404,12 @@ public class WorkGiver_DoBillOptimization : ClassWithFishPatches public override Delegate TargetMethodGroup => WorkGiver_DoBill.TryFindBestIngredientsInSet_NoMixHelper; public static void Prefix(ref bool alreadySorted, Bill? bill) - => alreadySorted = bill?.billStack is { } stack + => alreadySorted = alreadySorted + || (bill?.billStack is { } stack #if V1_4 && stack.billGiver is not Building_MechGestator #endif - ; + ); public static CodeInstructions? Transpiler(CodeInstructions codes, MethodBase method) {