From 28b2449b920dd9c1ba741aa4760708ee04c6dd0f Mon Sep 17 00:00:00 2001 From: c0ffee Date: Thu, 16 Sep 2021 10:57:49 -0700 Subject: [PATCH] flickering bug fix --- 1.3/Assemblies/Rimworld-Animations.dll | Bin 54272 -> 54272 bytes .../OtherModPatches/HarmonyPatch_AlienRace.cs | 28 ++++++++++-------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/1.3/Assemblies/Rimworld-Animations.dll b/1.3/Assemblies/Rimworld-Animations.dll index 2b0ae1fbd5273d703ffe652703ef3a95712f6734..f755ae96018206f9d07baffb6528b325f0e82643 100644 GIT binary patch delta 7498 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 delta 7187 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 Pb3jYP-@YS_y>() != null && ___pawn.TryGetComp().isAnimating) + { + return false; + } + return true; + } + } + /* [HarmonyPatch(typeof(AlienRace.HarmonyPatches), "DrawAddons")] @@ -313,19 +327,7 @@ namespace Rimworld_Animations { } } - [HarmonyPatch(typeof(PawnGraphicSet), "ResolveApparelGraphics")] - public static class HarmonyPatch_ResolveApparelGraphics - { - public static bool Prefix(ref Pawn ___pawn) - { - - if (___pawn.TryGetComp() != null && ___pawn.TryGetComp().isAnimating) - { - return false; - } - return true; - } - } + */ }