Fixed error message related to dropping raw food

CombatExtendedRWMod · Jul 6, 2017 · 0c9983c · 0c9983c
1 parent 10b7fe1
commit 0c9983c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Assemblies/CombatExtended.dll b/Assemblies/CombatExtended.dll
diff --git a/Source/CombatExtended/Harmony/Harmony-JobGiver_DropUnusedInventory.cs b/Source/CombatExtended/Harmony/Harmony-JobGiver_DropUnusedInventory.cs
@@ -17,11 +17,14 @@ public static bool Prefix(JobGiver_DropUnusedInventory __instance, Pawn pawn, Th
             // Remove forced hold from timed out tamer food
             if (thing.def.IsIngestible && !thing.def.IsDrug && thing.def.ingestible.preferability <= FoodPreferability.RawTasty)
             {
-                pawn.HoldTrackerForget(thing);
+                if (pawn.HoldTrackerIsHeld(thing))
+                {
+                    pawn.HoldTrackerForget(thing);
+                }
                 return true;
             }
             var loadout = pawn.GetLoadout();
-            return loadout == null;
+            return !(loadout != null && loadout.SlotCount > 0);
         }
     }
 }