From 04ca72ec78387376061ee28c325797e58ea02db0 Mon Sep 17 00:00:00 2001 From: Shabakur Date: Fri, 18 Nov 2022 14:03:21 +0100 Subject: [PATCH] Fixed some null reference errors --- ...b2a96d40-597e-4f98-9348-1aa3d00ca97c.vsidx | Bin 0 -> 19997 bytes .../FileContentIndex/read.lock | 0 .../Source/shabe_genesaddons/GeneUtility.cs | 8 ++++++++ ...gnTimeResolveAssemblyReferencesInput.cache | Bin 7213 -> 7218 bytes ...genesaddons.csproj.AssemblyReference.cache | Bin 23894 -> 25833 bytes ...genesaddons.csproj.CoreCompileInputs.cache | 2 +- ...be_genesaddons.csproj.FileListAbsolute.txt | 4 ++++ .../shabe_genesaddons.csproj | 8 ++++---- 8 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/b2a96d40-597e-4f98-9348-1aa3d00ca97c.vsidx create mode 100644 RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/read.lock diff --git a/RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/b2a96d40-597e-4f98-9348-1aa3d00ca97c.vsidx b/RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/b2a96d40-597e-4f98-9348-1aa3d00ca97c.vsidx new file mode 100644 index 0000000000000000000000000000000000000000..be39e5d40467ab0657128ad8e66169760cf0ead5 GIT binary patch literal 19997 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 BBaZ+8 literal 0 HcmV?d00001 diff --git a/RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/read.lock b/RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/read.lock new file mode 100644 index 0000000..e69de29 diff --git a/RJW-Genes-Addons/Source/shabe_genesaddons/GeneUtility.cs b/RJW-Genes-Addons/Source/shabe_genesaddons/GeneUtility.cs index 5a13b5d..1f31d15 100644 --- a/RJW-Genes-Addons/Source/shabe_genesaddons/GeneUtility.cs +++ b/RJW-Genes-Addons/Source/shabe_genesaddons/GeneUtility.cs @@ -11,11 +11,19 @@ namespace shabe_genesaddons { public static bool IsMechbreeder(Pawn pawn) { + if (pawn.genes == null) + { + return false; + } return pawn.genes.HasGene(GeneDefOf.rjw_genes_mechbreeder); } public static bool IsInsectIncubator(Pawn pawn) { + if (pawn.genes == null) + { + return false; + } return pawn.genes.HasGene(GeneDefOf.rjw_genes_insectincubator); } diff --git a/RJW-Genes-Addons/Source/shabe_genesaddons/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/RJW-Genes-Addons/Source/shabe_genesaddons/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 434c4312ccde2a822b0c768fd1d71beba78d6cdc..05556ca84ae7f2f26c8cc5f825adab603dfd8899 100644 GIT binary patch delta 166 zcmZ2$vB_e?5^n1mjLudup~b01#W5w7MfpiF{&}e`MVV!(F)sPZrManjC8>Ea?wKVX zrAaYCUg7cXsd=fz@s24e`FWckaIa=!jGdeyEVjF$T$6`gb6bMuqred7)*!B~ja^jN}#OyZ4{*0L{qhUGu0XHjOQC7KbZenpsYEg`# zp7G>2+!AaJXD^xRpPbCaV=#G_hQs9bjL53=L8{t#4sbC8&16zwU^v1uc_F{nM(gNd*oyZfwPR6K$nivR!s delta 27 jcmaEPlJVLuMh-ScWd;TY#>B~ja^jN}#OyZ4{)_ - ..\..\..\Shaba_Addons\Assemblies\0Harmony.dll + ..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\Shaba_Addons\Assemblies\0Harmony.dll False - ..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll + ..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll False - ..\..\..\RJW\1.4\Assemblies\RJW.dll + ..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\rjw-master\1.3\Assemblies\RJW.dll False @@ -52,7 +52,7 @@ - ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll + ..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll False