From 4a7faa53b614bf9fe1513655b00e007c03e3f2cd Mon Sep 17 00:00:00 2001 From: c0ffeeeeeeee Date: Thu, 15 Oct 2020 16:55:53 -0700 Subject: [PATCH] missing compbodyanimator check --- 1.2/Assemblies/Rimworld-Animations.dll | Bin 55296 -> 55808 bytes ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 8 ++++++++ 2 files changed, 8 insertions(+) diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index 4336fb49ba1d5aaae4ae786c22462c15f3d0fc27..caef78826bf0177b32ca7a35908d4275ba099729 100644 GIT binary patch delta 8579 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 bKDyR!{NP7HiypXpus5S!{^&Z_mZAB7Ra7b_ delta 8361 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 Re=FFS-Dx~~h3iPs{103~?T!Ed diff --git a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs index 3b2686d..b3a6e88 100644 --- a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -74,6 +74,14 @@ namespace Rimworld_Animations { pawnsToAnimate = pawnsToAnimate.Append(pawn).ToList(); } + for(int i = 0; i < pawnsToAnimate.Count; i++) { + + if(pawnsToAnimate[i].TryGetComp() == null) { + Log.Error("Error: " + pawnsToAnimate[i].Name + " of race " + pawnsToAnimate[i].def.defName + " does not have CompBodyAnimator attached!"); + break; + } + } + AnimationDef anim = AnimationUtility.tryFindAnimation(ref pawnsToAnimate, sexType, sexProps); if (anim != null) {