From ee1a40bb51fc467ae1e6795fd0c7efab71ae0a97 Mon Sep 17 00:00:00 2001
From: Bohica <53943479+Bohicatv@users.noreply.github.com>
Date: Sun, 16 Nov 2025 10:14:06 -0800
Subject: [PATCH] fix: Fixes movement pathing while in combat (#2271)

---
 Projects/UOContent/Mobiles/AI/AnimalAI.cs            | 2 +-
 Projects/UOContent/Mobiles/AI/ArcherAI.cs            | 8 +-------
 Projects/UOContent/Mobiles/AI/BerserkAI.cs           | 2 +-
 Projects/UOContent/Mobiles/AI/MageAI.cs              | 6 +++---
 Projects/UOContent/Mobiles/AI/MeleeAI.cs             | 2 +-
 Projects/UOContent/Mobiles/AI/PredatorAI.cs          | 2 +-
 Projects/UOContent/Mobiles/AI/ThiefAI.cs             | 2 +-
 Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs | 2 +-
 8 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Projects/UOContent/Mobiles/AI/AnimalAI.cs b/Projects/UOContent/Mobiles/AI/AnimalAI.cs
index 9e33414c7..5107b57fe 100644
--- a/Projects/UOContent/Mobiles/AI/AnimalAI.cs
+++ b/Projects/UOContent/Mobiles/AI/AnimalAI.cs
@@ -55,7 +55,7 @@ public class AnimalAI : BaseAI
             return true;
         }
 
-        if (!WalkMobileRange(combatant, 1, true, Mobile.RangeFight, Mobile.RangeFight))
+        if (!WalkMobileRange(combatant, 1, false, Mobile.RangeFight, Mobile.RangeFight))
         {
             if (Mobile.GetDistanceToSqrt(combatant) > Mobile.RangePerception + 1)
             {
diff --git a/Projects/UOContent/Mobiles/AI/ArcherAI.cs b/Projects/UOContent/Mobiles/AI/ArcherAI.cs
index 6491c42d5..19e0375c4 100644
--- a/Projects/UOContent/Mobiles/AI/ArcherAI.cs
+++ b/Projects/UOContent/Mobiles/AI/ArcherAI.cs
@@ -41,13 +41,7 @@ public class ArcherAI : BaseAI
             return true;
         }
 
-        if (Core.TickCount - Mobile.LastMoveTime > 1000 && !WalkMobileRange(
-                combatant,
-                1,
-                true,
-                Mobile.RangeFight,
-                Mobile.Weapon.MaxRange
-            ))
+        if (!WalkMobileRange(combatant, 1, false, Mobile.RangeFight, Mobile.Weapon.MaxRange))
         {
             this.DebugSayFormatted($"I am still not in range of {combatant.Name}");
 
diff --git a/Projects/UOContent/Mobiles/AI/BerserkAI.cs b/Projects/UOContent/Mobiles/AI/BerserkAI.cs
index f882d6fb5..4663ae8d0 100644
--- a/Projects/UOContent/Mobiles/AI/BerserkAI.cs
+++ b/Projects/UOContent/Mobiles/AI/BerserkAI.cs
@@ -38,7 +38,7 @@ public class BerserkAI : BaseAI
             return true;
         }
 
-        if (!WalkMobileRange(combatant, 1, true, Mobile.RangeFight, Mobile.RangeFight))
+        if (!WalkMobileRange(combatant, 1, false, Mobile.RangeFight, Mobile.RangeFight))
         {
             this.DebugSayFormatted($"I am still not in range of {combatant.Name}");
 
diff --git a/Projects/UOContent/Mobiles/AI/MageAI.cs b/Projects/UOContent/Mobiles/AI/MageAI.cs
index 9ed02cd02..0ca4893e5 100644
--- a/Projects/UOContent/Mobiles/AI/MageAI.cs
+++ b/Projects/UOContent/Mobiles/AI/MageAI.cs
@@ -168,7 +168,7 @@ public class MageAI : BaseAI
     {
         if (!SmartAI)
         {
-            if (!MoveTo(m, true, Mobile.RangeFight))
+            if (!MoveTo(m, false, Mobile.RangeFight))
             {
                 OnFailedMove();
             }
@@ -182,14 +182,14 @@ public class MageAI : BaseAI
             {
                 RunFrom(m);
             }
-            else if (!Mobile.InRange(m, Math.Max(Mobile.RangeFight, 2)) && !MoveTo(m, true, 1))
+            else if (!Mobile.InRange(m, Math.Max(Mobile.RangeFight, 2)) && !MoveTo(m, false, 1))
             {
                 OnFailedMove();
             }
         }
         else if (!Mobile.InRange(m, Mobile.RangeFight))
         {
-            if (!MoveTo(m, true, 1))
+            if (!MoveTo(m, false, 1))
             {
                 OnFailedMove();
             }
diff --git a/Projects/UOContent/Mobiles/AI/MeleeAI.cs b/Projects/UOContent/Mobiles/AI/MeleeAI.cs
index edf0b108e..01ef3c06f 100644
--- a/Projects/UOContent/Mobiles/AI/MeleeAI.cs
+++ b/Projects/UOContent/Mobiles/AI/MeleeAI.cs
@@ -67,7 +67,7 @@ public class MeleeAI : BaseAI
             }
         }
 
-        if (!MoveTo(combatant, true, Mobile.RangeFight))
+        if (!MoveTo(combatant, false, Mobile.RangeFight))
         {
             if (AcquireFocusMob(Mobile.RangePerception, Mobile.FightMode, false, false, true))
             {
diff --git a/Projects/UOContent/Mobiles/AI/PredatorAI.cs b/Projects/UOContent/Mobiles/AI/PredatorAI.cs
index fe5b06a6f..5e0e01520 100644
--- a/Projects/UOContent/Mobiles/AI/PredatorAI.cs
+++ b/Projects/UOContent/Mobiles/AI/PredatorAI.cs
@@ -41,7 +41,7 @@ public class PredatorAI : BaseAI
             return true;
         }
 
-        if (!WalkMobileRange(combatant, 1, true, Mobile.RangeFight, Mobile.RangeFight))
+        if (!WalkMobileRange(combatant, 1, false, Mobile.RangeFight, Mobile.RangeFight))
         {
             if (Mobile.GetDistanceToSqrt(combatant) > Mobile.RangePerception + 1)
             {
diff --git a/Projects/UOContent/Mobiles/AI/ThiefAI.cs b/Projects/UOContent/Mobiles/AI/ThiefAI.cs
index ff707f3df..2d67de801 100644
--- a/Projects/UOContent/Mobiles/AI/ThiefAI.cs
+++ b/Projects/UOContent/Mobiles/AI/ThiefAI.cs
@@ -43,7 +43,7 @@ public class ThiefAI : BaseAI
             return true;
         }
 
-        if (!WalkMobileRange(combatant, 1, true, Mobile.RangeFight, Mobile.RangeFight))
+        if (!WalkMobileRange(combatant, 1, false, Mobile.RangeFight, Mobile.RangeFight))
         {
             this.DebugSayFormatted($"I should be closer to {combatant.Name}");
         }
diff --git a/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs b/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs
index 3997a3856..3ecc94db2 100644
--- a/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs
+++ b/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs
@@ -93,7 +93,7 @@ public abstract partial class BaseFamiliar : BaseCreature
             Hidden = m_LastHidden = master.Hidden;
         }
 
-        if (AIObject?.WalkMobileRange(master, 5, true, 1, 1) == true)
+        if (AIObject?.WalkMobileRange(master, 5, false, 1, 1) == true)
         {
             Warmode = master.Warmode;
             Combatant = master.Combatant;