Fix merge conflict: Do not stop player-forced jobs when curPath is recalculated

[Copilot]

Fence crossings trigger two curPath recalculations, causing stopDead() to interrupt player-forced jobs (e.g., eating). Fix adds a playerForced guard and uses null-conditional operators to tighten the path checks.

Changes

• Avatar_Movement.cs — Two call sites updated:

  // Before
  if (pawn.pather.curPath != null) pawn.pather.StopDead();
  
  // After
  if (pawn.pather?.curPath != null && !(pawn.jobs?.curJob?.playerForced ?? false)) pawn.pather.StopDead();

• PerspectiveShift.dll — Binary conflict resolved by taking the upstream version (includes the "disable double-click to equip" mod option from fernyrepos/main).

[Copilot]

🟡 Changes recommended

The new interaction/camera changes introduce concrete runtime/UX risks (null letter text usage and camera target mismatch) that should be fixed before approval.

Once you've addressed the issues Copilot identified, you can request another Copilot review.

Pull request overview

This PR resolves merge-related behavior changes in the mod by updating avatar movement/camera handling and expanding interaction/settings support (including the upstream “disable double-click to equip” option), while adding the required localization keys.

Changes:

• Adds a new mod setting to disable the “double-click to wear/equip” shortcut and wires it into the interaction flow.
• Adds an interaction handler to capture eligible carried pawns/entities into a holding platform (CompEntityHolder / CompHoldingPlatformTarget).
• Adjusts avatar camera targeting fallback behavior and updates English localization keys for new UI/messages.

File summaries

File	Description
Languages/English/Keyed/Keys.xml	Adds new localized strings for the new setting and holding-platform capture feedback.
1.6/Source/PerspectiveShiftSettings.cs	Introduces a persisted disableDoubleClickEquip setting.
1.6/Source/PerspectiveShiftMod.cs	Exposes the new setting in the mod settings UI.
1.6/Source/Avatar/Avatar_Movement.cs	Updates camera fallback position calculation during camera updates.
1.6/Source/Avatar/Avatar_Interaction.cs	Adds double-click equip gating + new holding-platform capture interaction.

Review details

• Files reviewed: 5/6 changed files
• Comments generated: 3
• Review effort level: Lite

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.