From 3f7a7bfdc3047f7eec3325f04c46354d22b20c5e Mon Sep 17 00:00:00 2001
From: c0ffee <platinumspoons@gmail.com>
Date: Mon, 22 Apr 2024 17:31:20 -0700
Subject: [PATCH] better error handling for missing rootnodes or rendernode
 animationworkers

---
 1.5/Assemblies/Rimworld-Animations.dll   | Bin 39424 -> 39424 bytes
 1.5/Source/Comps/CompExtendedAnimator.cs |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll
index fa7e05c51ae2a9885f86e44f30b3396044771f0c..0edf7e753ae470423c7657757e00b1ec14d27267 100644
GIT binary patch
delta 2151
zcmY+GeN0nV7>9qiAGa0Gg;v_hM=K?Qlp)*>(ZN7b`BpTYUB)DSEp9pyqeZu|QFAGU
zYNme(CB#h3%%VmXO^n6FEpEvI>C8eFm#E1!lCdS5*+*P5muzN^-E+?M(l#Nv&wYOH
z``&ZQInXy@=$kN{JZ74_{3teb!X<n#G~O;$#RQ?)?79NDVg-g}u`NQea55Ga6nmF?
zkA7Oz9|O$r$L)sYWNnE6*Z?~W-eN#J&;X<rm6?`0O5MGU`nA0`pkJGN+tuqdvCQZw
z6-95XGh<Iy$ZocaA7)u#x6s=byTu!Oka2K9-FtI$bI+?2<NnOErAkj3eS#>`778RA
z)^bW=>p}Y`3v%FO6wSWv6p@3X6sk+1EsPS_oI#V@Q{0{u3i70I(Lj@k9jK9%!#shb
zhP%cbgi`WRoh&2=r+78ma};APu4zPj<>FgCN$I{$86+3KCDrA@B-2$UK<n~QB*?LU
zYrIMoyF0*E>qd)~*=5QmZd}pmZSk%#A2W>jd&$Q`PIyO6<|E{zy`#A2EF=YZtkJB?
zM+&j`1?JcU^_yj%g!zZ;Riqf*3X^<%2||n#pt1y}iuuA)*cfqFiXKK`EOfV!GPsw|
zC(E%kh2#`^nNh-8mcEIU<BjDCEli*wZ^l%Pn_S}KOc63xRB|_LrL>+AU%iX~qoM47
zoDL#mx9%31WdyalF1H9DP9!CLm|!#tuO~o!AS*!Uk3#nBAQjlUf)1o|FR8?NMttB(
zT+v-OS&7px(j<4aILC<A4Ut;3Rn5EAc#RQtV`Mc(bh<#+z*-GDpSP)pLq$IR8mUJy
zBkmgD)7=fyfPF8`k7&kWMs&nY(u|85$(~!J6@@jtr|kKjY`}Car^&pBqzz9gDc~=0
zBXU=9=~bf}u}mY`^N4K1PDcD;{OHo%9P#6{M#r<#q|Lab(NViw3Scs+t^?C4bcd0`
zn|5F(MgFW)z}f+<rjIs-R!6zC4W>FyvnCPS(a$K1anwrNG0cef+<|k95}3%pZP@|!
zjk7L4WjwXKjxk0FMY!Oumv-R^LteNWrnNL0#faN4?Z&H|)D0A{?!iGuQ=sEJafy>a
zAFUI&7!6=+Zo9M(jq6w!w(<7E&nSV<U2jSI@tNindddYcrAc}=1o2h<d|?o`81b(u
zh*I@j=D#!lS%X-^D1i!f|8(QNdQQ{b^w%O0hwxaVQO{lDA*44^H;N`(k8}tv8W|N^
zzjPRXKSSHF)Pq-=dGwFW9;p`-I(;OCFs;#p%=6L_c<A2{wdoz{s-$2QBmNHi(8MT$
zEaAG;hn-0-jJ>*3u1jG=G^|mh{W!yjuQ!76q{0ZUYRP<@O^@K4q~rkZB_#*&qn6x{
zFQftdn&bxYSaVB+N(F;xYo)7*V1pp4^a~@tib4FTxh2e5*3;xOXJZrrcZIqW)Gl?5
zW`!~J@QR{Aqrv=2l_oaOF0%`|7f(rVMsb6q;C0dHq$a;y+@#X9=GvTJOHpLDu|naD
zbDQcGG2#ysg@;iDPt<)7g)hk+MRokhx_7H>j;i0spUTG@$3L~%ZhzNb5I2R$bJ9-j
j-vQeC{g`_=Pw0wQ4__AI86!`Oh7-QH{nR62$Y=Q<&5Ee!

delta 2121
zcmY+_ZA?>F7zgnGZK17rF0?9AXlu(PqYh~+GR0X@1bGoOL`=xo#5jyPCQ)8oNW@%f
z3z!YFl@hj07Rka0EHM)5%#v;HMbhlW4`xxaY;1$+HnMDCS!U*p$nJTuwEb|>AOGih
z&be*xrSpoW^NQy6a|y>b*Zv#qwMs7p$7&^GNRqM>|G5lULz$ZOp=YIR=~&1oDW;Nf
zuvfXdYLEzL*reG=o=lJcBVdBYnGNVplmJPmchRMWF16~Cq&pGnN<K<XnG#L9w^r(5
z(w_(|CZE*i`JW26rwrvN)wy(ZH<DIJ#EcmxpW&qGy=Ce6lV|2zsXC-%Ax>#7)+e$J
zOcCr$rj?uGvh8uI;FZ#-hE^i<##ULW;uYx8Oli}xKd!z$Dm_WZN#2dxbVZwi^Fnl1
z2F9Y5RN<(SNd_ik`Yf1^>9b%#a)q+I&IY5KUQvKukqr)}2pSU1#D;T1r*u<VJFYTy
zvr0QY<-*Hqr5*b{>~q0)saYfwH-u)b9+HKk&}FYh*}Y+DpLN*J6v5BtZDbv$nfT-!
z%*A9msLrE(KCG~nlU&?m;*~Buij#gLI|DnP3+tF7hTP?Qi3?tZ6PcDD6I>V)dM8B(
zH{^WU7(t(b>Io*kg&R3cLGyp9tB4zg(JU>|jSA6s+@^yEhhr)|=w%v!(@{e_xSOxg
zEe7Cr93*+jf11nbc#-7e3=`jQ6V64m7P1Mgn`tG_yy#$}LxaSNtb(Pi5FRF)4U$3}
zk7|VMz)S(?{(MX^{)mR}lVU8!j46R(3mr<wd_+o6{LIo8WvF7J*%zb?okDKMO;Uk}
zQO%G_414*M>y|lEh1;ss{rQKu2Y-vu>6jsVkg$!Hx*hXmFAA9WL90;`%@#>DT7_O+
znI!K+K&Z!LlWTAxrmqgeak@mMh^w!|)wuAJsA>##_?BrB6{}qG0ZbRtqfKHqL5F(O
zZKv{K3|_e&jZFNY2hqV4!4>;0{XyJin#8Zk3;IK7+d=!3h%{m=mK*R5BX2x{X)g5J
zs^uea712_f)fkSVoQZGWhya&FkJgA$rU0JLsFh!WZRg`Y9h%@|ir{1GF}VqSJX6?h
z(TqV6(uYSgE*38}He-~De@)HMst;Cvm`8?Yn3*ETQ}3S^gw^LQy<_gB>ClQBLIaK|
zZ7c3D4WQK6F1Nx_N-GDTXpLv(Hry1{8vEpStS{r?Un%YKY4k>QQSQL7&<`o^%4cw2
z=(ao|D@djP62uqUi8V}qtdu^GJ5dmm`B3yYQ`FFh=LEN^I*U_G{CfTH#Wecyim0?>
zXt^IFF_i&K#8d|Gp{Q)aH93ImF<BRGh-|H-<f98&74+PGR7yHkpEL1aLKnUk*;<zU
z6qn7#We=m7q)tiOO=r$ZgX+Vp8&;t%d%mjPN|r5aSu?4~-RS3(oK{+TL4=>JDOEKr
zvZ~at)XLw4-cCKBX7fz^pxwC7<i`W`KIn#_if+NP9+;T?n8j_mNBz5mHWOdN*LK!#
zF_PTzUnXiTyI%YK%V5p-cc#PZJILx41><xEf9<319l^}iQc3tw-z6zD)aMK*_dn2T
O4tv6;H|M3GNB=+fkE|~M

diff --git a/1.5/Source/Comps/CompExtendedAnimator.cs b/1.5/Source/Comps/CompExtendedAnimator.cs
index ed810fd..9782ae9 100644
--- a/1.5/Source/Comps/CompExtendedAnimator.cs
+++ b/1.5/Source/Comps/CompExtendedAnimator.cs
@@ -204,10 +204,10 @@ namespace Rimworld_Animations {
         public void CheckAndPlaySounds()
         {
 
-            PawnRenderNode rootNode = pawn.Drawer.renderer.renderTree.rootNode;
+            PawnRenderNode rootNode = pawn.Drawer?.renderer?.renderTree?.rootNode;
 
             //check if the rootnode has sounds; if so play it
-            if (rootNode.AnimationWorker is AnimationWorker_KeyframesExtended animWorker)
+            if (rootNode?.AnimationWorker is AnimationWorker_KeyframesExtended animWorker)
             {
                 SoundDef sound = animWorker.soundAtTick(rootNode.tree.AnimationTick);
                 if (sound != null)
@@ -220,7 +220,7 @@ namespace Rimworld_Animations {
             //do the same for all the child nodes
             foreach (PawnRenderNode node in rootNode.children)
             {
-                if (node.AnimationWorker is AnimationWorker_KeyframesExtended childrenAnimWorker)
+                if (node?.AnimationWorker is AnimationWorker_KeyframesExtended childrenAnimWorker)
                 {
                     SoundDef sound = childrenAnimWorker.soundAtTick(node.tree.AnimationTick);
                     if (sound != null)