From 0c9983c412563bdce7f545861e30f5f87b07904c Mon Sep 17 00:00:00 2001 From: NoImageAvailable Date: Thu, 6 Jul 2017 13:03:26 +0200 Subject: [PATCH] Fixed error message related to dropping raw food --- Assemblies/CombatExtended.dll | Bin 297472 -> 297472 bytes .../Harmony-JobGiver_DropUnusedInventory.cs | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Assemblies/CombatExtended.dll b/Assemblies/CombatExtended.dll index f3398146c0d7ffb929634978143b7ce4a5dde388..0ba8285a855f31b4f48388efc8a32ae789855634 100644 GIT binary patch delta 6654 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 diff --git a/Source/CombatExtended/Harmony/Harmony-JobGiver_DropUnusedInventory.cs b/Source/CombatExtended/Harmony/Harmony-JobGiver_DropUnusedInventory.cs index be35d8f405..45cc9a18d0 100644 --- 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); } } }