From ed2a6fd7aba1f67c4a0567e6a8732af26a79fc02 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Sun, 29 Aug 2021 10:29:41 -0700 Subject: [PATCH] null ref check in cache clearing --- 1.3/Assemblies/Rimworld-Animations.dll | Bin 54784 -> 54784 bytes .../HarmonyPatch_SetPawnAnimatable.cs | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/1.3/Assemblies/Rimworld-Animations.dll b/1.3/Assemblies/Rimworld-Animations.dll index 9312f8cabec80ca0dab4c36cd5748231a6cf6516..b335b4ae24504bc088a8f884f3d3670b6e6c3fed 100644 GIT binary patch delta 1435 zcmYk6TWAwo7=_oKw6V>23rG^RYU+hnTcwJiVo@K2Dx3rQplxluwNMk&G}TPzqODO< zt71W8Ir?xs9H@c_^+6*DzA6<&t(HFc(1%lwPg)RBL`B5?|9jUOa^ah`*Ixgcnat@S z-{~RW<@3H9xBn?zTqK?rZZ`^dK!~c+*d$OfP-)Z-G>ax7L+o~j%0YMnmAArE>h*2E?YHDYx-*gD@*N9M!2nTB5U$te)k4(Qjw8H2)2b8Qr zF}7*Vx?E!;ZG9E}^9BQZ5N9exwuesz_TsYEve5j;SwF5%!}E^|@c-F0&2C57JU4wxgTrDzed-*^cL$ zXwW$RV;V-p=SKps4o&+K7-v!?5?Fh9N~@faz;>o#d|W6>k0Q~UBXJl#^ZiJow^h-% z=&X_?{$^6cByp1|k7tORN!-`eV04-tn3o`59&M6RsMmBtQYZE?sbSJ+XHt8nkxqc} z^9aaI)9BU4K@m5*a7k0S5jT(F+ApKPaol5?5TDEa$l$)FTT50-%68B&6Xp5EmYG41 zBJsU~R`zObbn#|M{gPzb%Rmu# zHC@74x#y$bd=^H2^I3RJl#}hrXrZ~2BJv=kg(MS22xQU6r25)8uZjBF=;$J!>TAPN z#C>g?)Ef1*(W^D8YvT!1ZbDFB8zYP=(8gQ6luodNNlg^!U_3J&=-`ba4s`HNYZU0< zlh!EE!3K+coabOGQ(ul7I*4hJ0$p6!M1d|oWyyF3X9a0Ndph35d_^4ZBC0itcTuf1 zig%IJM0H(cnEE0)`X9RJX3XOtC~!>E|MJ4PupA1^V}#=$Fsbw8Vw6c;7!PBbXlxJk zp1Lp|$`tXS9_DCm^ba|yhlmzwQV%VfXi^VtOzPJ2kY-Z1o(Gpn-9a9{7XR!DH_UD5 zJa#9wzP8~)%aK%S>$Uww>%o`M6{Ac(9D#?E@+(@X42hxQUoTRkIQ!){pYg1|7#w>q I3UxDn0)jC&$p8QV delta 1413 zcmYk*UuaWz6bJC{@5ZJ!w;iiU8oO9iSFKW=b$gg)dlWjMYWFbPYX6x)m)P1wliWY0 zGc9*^b5%4%L{Lx!r?N7IJX8?G(OLRXY7rmyFx0Xa9~@&iq!b_aJLmV)cp;Ea&OP^g z&b>EdQ@*h&-?<-smp6CjC)bPn`CA=gs31gRS^G;MT&Op;6}m*D_`NVLa@AMmZ*+Vm zKL*NxVzp88c{nV&8mNY`nZ66QOX8A2BrNm=}a6 zk-(9g4>75uXx18$8pb}B8YYQ@EOpH!VhK>bhk(3j5{_=XCgNrao>qksH;-ZR zU8BHp{LESsuPgjWSIi-h}B)N7o+LeIYd_CG(fWWN<{D zI-^hhGx)VE&a>3qX;dDii@sHerM5_;f#u<2P{ehuvp6ZQIsIN=1~c#VWiU_5$?d5z zgT2EP;ei@6=wnfYKo%n`wXcOyE!x*Ye~S9lz82z2ysw3%uF<|099^SzE!<<}mIUo< zVTP#!Ej-ny(haupT#Ev2ET&6=HvUlJKpW3=jRI}F&@~FQ(Ujpn&a?3uYa+)R+Gy8B z3UqKzivk_I$Wr4tP711(S*3UfRZ1N1V6CoEyo0c=QM`jbEn3&Xx2%a!j{b)ZQcMqh zpujn;zvP2)5VtAN!y}IWg{AJ3gISh(FfQh_Xlxh%Ii*2eyiwvoUHDv8d)y``by2Cv zFQSY6S~RJP4wicLT*O%F)pIe#Qg4upzl&X|n${1ErrW1}`k{CCjm0~omv)?q7RRQS sgKN&eq(pW6O5Y>-`e4CXs4Pw`L`A;2viQN`iqClPWwH9nKhov@174Ihi~s-t diff --git a/1.3/Source/Patches/RimworldPatches/HarmonyPatch_SetPawnAnimatable.cs b/1.3/Source/Patches/RimworldPatches/HarmonyPatch_SetPawnAnimatable.cs index 8a58943..dad5b4c 100644 --- a/1.3/Source/Patches/RimworldPatches/HarmonyPatch_SetPawnAnimatable.cs +++ b/1.3/Source/Patches/RimworldPatches/HarmonyPatch_SetPawnAnimatable.cs @@ -16,7 +16,7 @@ namespace Rimworld_Animations { static bool ClearCache(Pawn pawn) { - return pawn.IsInvisible() || pawn.TryGetComp().isAnimating; + return pawn.IsInvisible() || (pawn.TryGetComp() != null && pawn.TryGetComp().isAnimating); } public static IEnumerable Transpiler(IEnumerable instructions)