Fix feedback for drafted pawn move order

Author: mibac138

Source/Client/Patches/Feedback.cs

@@ -5,9 +5,11 @@
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
+using Multiplayer.API;
 using RimWorld.Planet;
 using UnityEngine;
 using Verse;
+using Verse.AI;
 using Verse.Sound;
 
 namespace Multiplayer.Client.Patches
@@ -228,4 +230,30 @@ static void Finalizer(bool __state)
         }
     }
 
+    [HarmonyPatch(typeof(FloatMenuOptionProvider_DraftedMove),
+        nameof(FloatMenuOptionProvider_DraftedMove.PawnGotoAction))]
+    static class DraftedMove_GotoFeedbackPatch
+    {
+        private static MethodInfo tryTakeOrderedJob =
+            AccessTools.Method(typeof(Pawn_JobTracker), nameof(Pawn_JobTracker.TryTakeOrderedJob));
+
+        static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+        {
+            foreach (var inst in instructions)
+            {
+                if (inst.Calls(tryTakeOrderedJob)) inst.operand = ((Delegate)CustomTryTakeOrderedJob).Method;
+                yield return inst;
+            }
+        }
+
+        [SyncMethod(exposeParameters = [1])]
+        static bool CustomTryTakeOrderedJob(Pawn_JobTracker self, Job job, JobTag? tag = JobTag.Misc,
+            bool requestQueueing = false)
+        {
+            if (self.TryTakeOrderedJob(job, tag, requestQueueing) && TickPatch.currentExecutingCmdIssuedBySelf)
+                FleckMaker.Static(job.targetA.Cell, self.pawn.Map, FleckDefOf.FeedbackGoto);
+            return false;
+        }
+    }
+
 }

Source/Client/Syncing/Game/SyncDelegates.cs

@@ -36,7 +36,6 @@ public static void Init()
             // SyncDelegate.Lambda(typeof(FloatMenuOptionProvider_CarryToShuttle), "GetSingleOptionFor", 0).CancelIfAnyFieldNull().SetContext(mouseKeyContext);           // Carry to shuttle
             // SyncDelegate.Lambda(typeof(FloatMenuOptionProvider_Childcare), "GetOptionsFor", 0).CancelIfAnyFieldNull().SetContext(mouseKeyContext);                     // Breastfeed/give milk
             // SyncDelegate.Lambda(typeof(FloatMenuOptionProvider_DraftedAttack), "GetSingleOptionFor", 0).CancelIfAnyFieldNull().SetContext(mouseKeyContext);            // Drafted attack
-            // SyncDelegate.Lambda(typeof(FloatMenuOptionProvider_DraftedMove), "GetSingleOptionFor", 0).CancelIfAnyFieldNull().SetContext(mouseKeyContext);              // Drafted move (Goto)
             // SyncDelegate.Lambda(typeof(FloatMenuOptionProvider_DraftedRepair), "GetSingleOptionFor", 0).CancelIfAnyFieldNull().SetContext(mouseKeyContext);            // Drafted repair
             // SyncDelegate.Lambda(typeof(FloatMenuOptionProvider_DraftedTend), "GetOptionsFor", 0).CancelIfAnyFieldNull().SetContext(mouseKeyContext);                   // Drafted tend
             // SyncDelegate.Lambda(typeof(FloatMenuOptionProvider_DressOtherPawn), "GetSingleOptionFor", 0).CancelIfAnyFieldNull().SetContext(mouseKeyContext);           // Dress other pawn