From 5892f561fbc75c1626d655cdfae134489bcc2475 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Sat, 17 Apr 2021 22:49:02 -0700 Subject: [PATCH] Added check to make sure pawn is in gathering area before joining --- Assemblies/RJW-Events.dll | Bin 18432 -> 18944 bytes Source/JobGivers/JobGiver_FindOrgyPartner.cs | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Assemblies/RJW-Events.dll b/Assemblies/RJW-Events.dll index ce48f3fad3916c48ddde2bf839069eb1e3937c92..77c75aa29092d681f7775fd16372e61ed7d19aab 100644 GIT binary patch delta 7342 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 KXKdGS_x}OiyXpA= delta 6797 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 targets = LordUtility.GetLord(pawn).ownedPawns; + List targets = LordUtility.GetLord(pawn).ownedPawns.Where((Pawn p) => { + + if(p?.mindState?.duty == null) + { + return false; + } + + IntVec3 cell = p.mindState.duty.focus.Cell; + if (GatheringsUtility.InGatheringArea(p.Position, cell, p.Map)) { + return true; + } + return false; + }).ToList(); + if (!BestPawnForOrgyExists(pawn, targets, out Pawn pawn2)) {