Skip to content

Fix TendSelf/TendPatient reservation conflict in CompTend #4653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WhiteGiverMa wants to merge 2 commits into
base: Development
Choose a base branch
from
Open

Fix TendSelf/TendPatient reservation conflict in CompTend #4653

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14485dc
Fix TendSelf/TendPatient reservation conflict in CompTend
WhiteGiverMa Jul 5, 2026
e803efb
Translate code comment
N7Huntsman Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Source/CombatExtended/CombatExtended/AI/Comps/CompTend.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,20 @@ public override Job TryGiveTacticalJob()
lastTendJobCheckedAt = GenTicks.TicksGame - COOLDOWN_TEND_JOB_CHECK / 2;
return SuppressionUtility.GetRunForCoverJob(SelPawn);
}
// Do not assign TendSelf if SelPawn is already reserved by another pawn (e.g currently being treated via TendPatient)
// Otherwise, this will trigger reservation conflict errors in TryMakePreToilReservations.
var reservations = SelPawn.Map?.reservationManager?.ReservationsReadOnly;
if (reservations != null)
{
for (int i = 0; i < reservations.Count; i++)
{
if (reservations[i].Target == SelPawn && reservations[i].Claimant != SelPawn)
{
lastTendJobCheckedAt = GenTicks.TicksGame;
return null;
}
}
}
lastTendJobAt = GenTicks.TicksGame;
Job job = JobMaker.MakeJob(CE_JobDefOf.TendSelf, SelPawn);
job.endAfterTendedOnce = false;
Expand Down
Loading