From c2ef4c604950e976a8949927ecbc31bc328fdd81 Mon Sep 17 00:00:00 2001 From: c0ffeeeeeeee Date: Sat, 6 Mar 2021 17:10:35 -0800 Subject: [PATCH] stop anim if anim mid-save expose data fails --- 1.2/Assemblies/Rimworld-Animations.dll | Bin 59904 -> 59904 bytes About/Manifest.xml | 2 +- Source/Comps/CompBodyAnimator.cs | 6 ++++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index ba7dc0eea73316747ecd0e2ee3270709e07e1eab..ac8e119ec9c4de38da0fc89b692bc3c86b0a8b49 100644 GIT binary patch delta 6371 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 diff --git a/About/Manifest.xml b/About/Manifest.xml index 5062923..75f6513 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,5 +1,5 @@  Rimworld-Animations - 1.0.12 + 1.0.13 \ No newline at end of file diff --git a/Source/Comps/CompBodyAnimator.cs b/Source/Comps/CompBodyAnimator.cs index a6b814c..7ac3e09 100644 --- a/Source/Comps/CompBodyAnimator.cs +++ b/Source/Comps/CompBodyAnimator.cs @@ -198,7 +198,13 @@ namespace Rimworld_Animations { if (!isAnimating) return; + if (anim == null) { + isAnimating = false; + return; + } + animTicks++; + if (animTicks < anim.animationTimeTicks) { tickStage(); } else {