From 91fd071eba18fccb183607e8ffc0e5dd549d3e75 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Thu, 9 Jun 2022 17:51:12 -0700 Subject: [PATCH] bugfixes for recent rimworld update --- .../C0ffee's RJW Ideology Addons.dll | Bin 10752 -> 10752 bytes About/Manifest.xml | 2 +- .../1.3/Assemblies/CRIALactation.dll | Bin 26112 -> 26112 bytes ...rker_Precept_Lactating_Essential_Social.cs | 4 +++- CRIAOrgy/Assemblies/CRIAOrgy.dll | Bin 5120 -> 5120 bytes 5 files changed, 4 insertions(+), 2 deletions(-) diff --git a/1.3/Assemblies/C0ffee's RJW Ideology Addons.dll b/1.3/Assemblies/C0ffee's RJW Ideology Addons.dll index deb119703a23c2c541c6cbc60d634aadbc3fa5e8..d36dc39f15e7c13c91e85441aa74fcc622c4b622 100644 GIT binary patch delta 47 zcmZn&X$YCn!E$EqzTF#p%J^BB6ppZLW)nEXBOubQzKnH|rqhn(eybdb4))DAWHfjI Dz5)?T delta 47 zcmZn&X$YCn!NOwB+_|x*jGyJO{1?Z~YyyXP1ZJn?l#6T)b8MA8lx#P>wS4mp84X?l Dp;i&b diff --git a/About/Manifest.xml b/About/Manifest.xml index 5e18089..df657a6 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,5 +1,5 @@ C0ffeeRIA - 0.0.3 + 0.0.4 diff --git a/CRIALactation/1.3/Assemblies/CRIALactation.dll b/CRIALactation/1.3/Assemblies/CRIALactation.dll index 9eee309d20a8d681e675fb68b63db93fd23560b9..ec924bcddb338ab6373a07fb4cf1cd608d4b98a6 100644 GIT binary patch delta 2709 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 diff --git a/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential_Social.cs b/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential_Social.cs index b41acd6..7ba9fb9 100644 --- a/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential_Social.cs +++ b/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential_Social.cs @@ -15,6 +15,8 @@ namespace CRIALactation protected override ThoughtState ShouldHaveThought(Pawn p, Pawn otherPawn) { + if (p == null || otherPawn == null) return false; + if (!LactationUtility.HasMilkableBreasts(otherPawn)) return false; if (LactationUtility.IsHucow(otherPawn)) @@ -27,7 +29,7 @@ namespace CRIALactation } - if(!otherPawn.ageTracker.Adult) + if(otherPawn.ageTracker?.Adult == null || !otherPawn.ageTracker.Adult) { return false; } diff --git a/CRIAOrgy/Assemblies/CRIAOrgy.dll b/CRIAOrgy/Assemblies/CRIAOrgy.dll index 21ec48e8860b514322ca466409b057c4fc1b6212..68947c624bfcc08ced2b9550691730399ab3d2f6 100644 GIT binary patch delta 47 zcmV+~0MP${D1a!Chy;K-Y~QhrbOi(gAjAZ-1O{9L5T_~_-FQLFO1z{DMC_ FkO|d!6dC{k