From ca53926996a9bafa9e78277b94bdb67ed83e8c35 Mon Sep 17 00:00:00 2001 From: Platinum Date: Wed, 22 Apr 2020 17:52:59 -0700 Subject: [PATCH] null ref checks --- 1.1/Assemblies/Rimworld-Animations.dll | Bin 45568 -> 45568 bytes Defs/AnimationDefs/Animations_vanilla.xml | 9 ++++++--- .../Patches/HarmonyPatch_FacialAnimation.cs | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/1.1/Assemblies/Rimworld-Animations.dll b/1.1/Assemblies/Rimworld-Animations.dll index fe26b9f3b6ca8f52095670f21a340bad91436c14..e3fe38d611869c38e6a5fc05e776088ef56ab30b 100644 GIT binary patch delta 5032 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 diff --git a/Defs/AnimationDefs/Animations_vanilla.xml b/Defs/AnimationDefs/Animations_vanilla.xml index 11b8c68..dc3fd5e 100644 --- a/Defs/AnimationDefs/Animations_vanilla.xml +++ b/Defs/AnimationDefs/Animations_vanilla.xml @@ -1968,24 +1968,27 @@
  • Anal
  • Vaginal
    • + + + +
  • Human
    • - -
  • Human
    • -     true true +
  • Human
    • true +     diff --git a/Source/Patches/HarmonyPatch_FacialAnimation.cs b/Source/Patches/HarmonyPatch_FacialAnimation.cs index f4f1572..6b7a7f4 100644 --- a/Source/Patches/HarmonyPatch_FacialAnimation.cs +++ b/Source/Patches/HarmonyPatch_FacialAnimation.cs @@ -69,7 +69,7 @@ namespace Rimworld_Animations { public static bool Prefix_IsSameA(JobDef job, string ___jobDef, ref bool __result) { - if(___jobDef == "Lovin" && rjwLovinDefNames.Contains(job.ToString())) { + if(___jobDef != null && ___jobDef == "Lovin" && job?.defName != null && rjwLovinDefNames.Contains(job?.defName)) { __result = true; return false; } @@ -79,7 +79,7 @@ namespace Rimworld_Animations { public static bool Prefix_IsSameB(string jobName, string ___jobDef, ref bool __result) { - if (___jobDef == "Lovin" && rjwLovinDefNames.Contains(jobName)) { + if (___jobDef != null && ___jobDef == "Lovin" && jobName != null && rjwLovinDefNames.Contains(jobName)) { __result = true; return false; }