Merge branch 'nre-partner' into 'master'

Fix NRE when jobdriver partner is null

See merge request c0ffeeeeeeee/rimworld-animations!5

1.3/Source/Comps/CompBodyAnimator.cs

@@ -504,14 +504,29 @@ namespace Rimworld_Animations {
 
         public bool LoopNeverending()
         {
-            if(pawn?.jobs?.curDriver != null && 
+            return IsNeverEndingSex(pawn) || IsNeverEndingSexPartner(pawn);
-                (pawn.jobs.curDriver is JobDriver_Sex) && (pawn.jobs.curDriver as JobDriver_Sex).neverendingsex ||
-                (pawn.jobs.curDriver is JobDriver_SexBaseReciever) && (pawn.jobs.curDriver as JobDriver_Sex).Partner?.jobs?.curDriver != null && ((pawn.jobs.curDriver as JobDriver_Sex).Partner.jobs.curDriver as JobDriver_Sex).neverendingsex)
-            {
-                return true;
         }
 
+        public static bool IsNeverEndingSex(Pawn pawn)
+        {
+            bool hasDriver = pawn?.jobs?.curDriver != null;
+            if (!hasDriver)
                 return false;
+
+            return (pawn.jobs.curDriver is JobDriver_Sex jds) && jds.neverendingsex;
+        }
+
+        public static bool IsNeverEndingSexPartner(Pawn pawn)
+        {
+            bool hasDriver = pawn?.jobs?.curDriver != null;
+            if (!hasDriver)
+                return false;
+
+            var partner = (pawn.jobs.curDriver is JobDriver_SexBaseReciever jds) ? jds.Partner : null;
+            if (partner == null)
+                return false;
+
+            return IsNeverEndingSex(partner);
         }
 
         public void ResetOnLoop()

1.4/Source/Utilities/AnimationUtility.cs

@@ -25,6 +25,7 @@ namespace Rimworld_Animations {
             participants =
                 participants.OrderBy(p => 
                     p.jobs.curDriver is rjw.JobDriver_Sex
+                    && !(p.jobs.curDriver as rjw.JobDriver_Sex).Sexprops.isRevese /*Gargulefix!!!*/
                     && !(p.jobs.curDriver as rjw.JobDriver_Sex).Sexprops.isReceiver)
                 .OrderBy(p => rjw.xxx.can_fuck(p))
                 .ToList();