fix tending and interaction error

check if inventory contains any valid medicince before trying to select the best option.
fluffy-mods · Aug 27, 2021 · a2ba778 · a2ba778
1 parent 5452f28
commit a2ba778
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Assemblies/Pharmacist.dll b/Assemblies/Pharmacist.dll
diff --git a/Source/HarmonyPatches/HealthAIUtility_FindBestMedicine.cs b/Source/HarmonyPatches/HealthAIUtility_FindBestMedicine.cs
@@ -2,6 +2,7 @@
 // HealthAIUtility_FindBestMedicine.cs
 // 2017-02-11
 
+using System.Collections.Generic;
 using System.Linq;
 using HarmonyLib;
 using RimWorld;
@@ -43,9 +44,12 @@ bool allowedPredicate(Thing m) {
             //
             // thanks to KennethSammael for adding this check in the unofficial 1.3 update,
             // this code is adapted from his changes.
-            __result = healer.inventory.innerContainer
-                .Where(allowedPredicate)
-                .MaxBy(potencyGetter);
+            // Update; I adapted it badly. The fault was all mine.
+            IEnumerable<Thing> options = healer.inventory.innerContainer
+                .Where(allowedPredicate);
+            if (options.Any()) {
+                __result = options.MaxBy(potencyGetter);
+            }
             if (__result is not null || onlyUseInventory) {
                 return false;
             }

diff --git a/modinfo.json b/modinfo.json
@@ -6,7 +6,7 @@
     "version": {
         "major": 3,
         "minor": 2,
-        "build": 147
+        "build": 148
     },
     "author": {
         "name": "Fluffy",