From 6312643fb3d31974765a65cfcadaaf0c258f3e8a Mon Sep 17 00:00:00 2001
From: Ed86 <email@email.com>
Date: Wed, 26 Jun 2019 11:14:33 +0300
Subject: [PATCH] fix for error when removing parts
---
Source/Recipes/Remove_Part/Recipe_RemovePart.cs | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/Source/Recipes/Remove_Part/Recipe_RemovePart.cs b/Source/Recipes/Remove_Part/Recipe_RemovePart.cs
index c593e32c..e280becc 100644
--- a/Source/Recipes/Remove_Part/Recipe_RemovePart.cs
+++ b/Source/Recipes/Remove_Part/Recipe_RemovePart.cs
@@ -17,9 +17,10 @@ namespace rjw
public bool is_harvest(Pawn p, BodyPartRecord part)
{
foreach (Hediff hed in p.health.hediffSet.hediffs)
- if ((hed.Part.def == part.def) && hed.def.isBad && (hed.Severity >= 0.70f))
+ {
+ if ((hed.Part?.def == part.def) && hed.def.isBad && (hed.Severity >= 0.70f))
return false;
-
+ }
return true;
}
@@ -41,9 +42,15 @@ namespace rjw
if (har)
{
if (!p.Dead)
+ {
+ //Log.Message("alive harvest " + part);
ThoughtUtility.GiveThoughtsForPawnOrganHarvested(p);
+ }
else
+ {
+ //Log.Message("dead harvest " + part);
ThoughtUtility.GiveThoughtsForPawnExecuted(p, PawnExecutionKind.OrganHarvesting);
+ }
}
}
--
GitLab