Vampire Attendance Hotfix

Fixes attendance issues with vampires and potentially other non-standard humanoids in attending cult worship and sacrifices.

Author: jecrell

1.3/Assemblies/CultOfCthulhu.dll

@@ -29,7 +29,7 @@
     <li>CETeam.CombatExtended</li>
     <li>syrchalis.traitvalue</li>
   </loadAfter>
-  <description>1.0.23.4 (08-14-2021)
+  <description>1.0.23.5 (10-14-2021)
 
 
 [h1]Gameplay expansion for RimWorld.[/h1]
@@ -100,6 +100,10 @@ Michael Cailler, Jigsawjohn , Daniel Schott, Penelope Charli Whitman, Jerome Gon
 ========================
 Changelog
 ========================
+1.0.23.5 (10-14-2021)
+========================
+Fixes issue with vampires and potentially other non-standard humanoid pawn attendance for worship and sacrifices
+
 1.0.23.4 (08-14-2021)
 ========================
 Adds in empty trade tags list to prevent issues with debug incident list menus

About/About.xml

@@ -1,3 +1,7 @@
+1.0.23.5 (10-14-2021)
+========================
+Fixes issue with vampires and potentially other non-standard humanoid pawn attendance for worship and sacrifices
+
 1.0.23.4 (08-14-2021)
 ========================
 Adds in empty trade tags list to prevent issues with debug incident list menus

About/Changelog.txt

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>CallofCthulhuCults</identifier>
-  <version>1.0.23.4</version>
+  <version>1.0.23.5</version>
   <dependencies />
   <incompatibleWith />
   <loadBefore />

About/Manifest.xml

@@ -1 +1 @@
-1.0.23.4
+1.0.23.5

About/Version.txt

@@ -286,9 +286,7 @@ public static void GetWorshipGroup(Building_SacrificialAltar altar, IEnumerable<
 
         public void GetWorshipGroup(IEnumerable<IntVec3> inRangeCells, bool forced = false)
         {
-            _ = Faction;
-            _ = this.GetRoom();
-
+            
             if (AvailableWorshippers == null || AvailableWorshippers.Count <= 0)
             {
                 return;

Source/CultOfCthulhu/NewSystems/Worship/Building_SacrificialAltar_Worship.cs

@@ -1914,7 +1914,7 @@ public static Pawn DetermineBestPreacher(Map map)
 
         public static bool ShouldAttendeeKeepAttendingWorship(Pawn p)
         {
-            return !p.Downed && (p.needs == null || !p.needs.food.Starving) && p.health.hediffSet.BleedRateTotal <= 0f && (p.needs.rest == null || p.needs.rest.CurCategory < RestCategory.Exhausted) && !p.health.hediffSet.HasTendableNonInjuryNonMissingPartHediff(false) && p.Awake() && !p.InAggroMentalState && !p.IsPrisoner;
+            return !p.Downed && (p?.needs == null || p?.needs?.food?.Starving != true) && p?.health?.hediffSet?.BleedRateTotal <= 0f && (p?.needs?.rest == null || p?.needs?.rest?.CurCategory < RestCategory.Exhausted) && p?.health?.hediffSet?.HasTendableNonInjuryNonMissingPartHediff(false) != true && p?.Awake() == true && p?.InAggroMentalState != true && p?.IsPrisoner != true;
         }
 
         //Checkyoself