diff --git a/Assemblies/RJW-Events.dll b/Assemblies/RJW-Events.dll index ce48f3f..77c75aa 100644 Binary files a/Assemblies/RJW-Events.dll and b/Assemblies/RJW-Events.dll differ diff --git a/Source/JobGivers/JobGiver_FindOrgyPartner.cs b/Source/JobGivers/JobGiver_FindOrgyPartner.cs index ec0e7ba..27e3fd2 100644 --- a/Source/JobGivers/JobGiver_FindOrgyPartner.cs +++ b/Source/JobGivers/JobGiver_FindOrgyPartner.cs @@ -52,7 +52,20 @@ namespace RJW_Events return null; } - List 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)) {