From 3db8d740f9cfc01b29ddf1a57e46f79b1bbaa013 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Mon, 13 Mar 2023 03:00:03 -0400
Subject: [PATCH] Core/Movement: Allow specifying timeout for random movement

Port From (https://github.com/TrinityCore/TrinityCore/commit/66b29fba44be39609fb79f2b35d82078b6656f91)
---
 .../Generators/RandomMovementGenerator.cs     | 32 +++++++++++++++----
 Source/Game/Movement/MotionMaster.cs          |  4 +--
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/Source/Game/Movement/Generators/RandomMovementGenerator.cs b/Source/Game/Movement/Generators/RandomMovementGenerator.cs
index ed7e43811..78f4b29dd 100644
--- a/Source/Game/Movement/Generators/RandomMovementGenerator.cs
+++ b/Source/Game/Movement/Generators/RandomMovementGenerator.cs
@@ -9,7 +9,14 @@ namespace Game.Movement
 {
     public class RandomMovementGenerator : MovementGeneratorMedium<Creature>
     {
-        public RandomMovementGenerator(float spawnDist = 0.0f)
+        PathGenerator _path;
+        TimeTracker _timer;
+        TimeTracker _duration;
+        Position _reference;
+        float _wanderDistance;
+        uint _wanderSteps;
+
+        public RandomMovementGenerator(float spawnDist = 0.0f, TimeSpan? duration = null)
         {
             _timer = new TimeTracker();
             _reference = new();
@@ -19,6 +26,8 @@ namespace Game.Movement
             Priority = MovementGeneratorPriority.Normal;
             Flags = MovementGeneratorFlags.InitializationPending;
             BaseUnitState = UnitState.Roaming;
+            if (duration.HasValue)
+                _duration = new TimeTracker(duration.Value);
         }
 
         public override void DoInitialize(Creature owner)
@@ -56,6 +65,17 @@ namespace Game.Movement
             if (HasFlag(MovementGeneratorFlags.Finalized | MovementGeneratorFlags.Paused))
                 return true;
 
+            if (_duration != null)
+            {
+                _duration.Update(diff);
+                if (_duration.Passed())
+                {
+                    RemoveFlag(MovementGeneratorFlags.Transitory);
+                    AddFlag(MovementGeneratorFlags.InformEnabled);
+                    return false;
+                }
+            }
+
             if (owner.HasUnitState(UnitState.NotMove) || owner.IsMovementPreventedByCasting())
             {
                 AddFlag(MovementGeneratorFlags.Interrupted);
@@ -90,6 +110,10 @@ namespace Game.Movement
                 // TODO: Research if this modification is needed, which most likely isnt
                 owner.SetWalk(false);
             }
+
+            if (movementInform && HasFlag(MovementGeneratorFlags.InformEnabled))
+                if (owner.IsAIEnabled())
+                    owner.GetAI().MovementInform(MovementGeneratorType.Random, 0);
         }
 
         public override void Pause(uint timer = 0)
@@ -197,11 +221,5 @@ namespace Game.Movement
         {
             return MovementGeneratorType.Random;
         }
-
-        PathGenerator _path;
-        TimeTracker _timer;
-        Position _reference;
-        float _wanderDistance;
-        uint _wanderSteps;
     }
 }
diff --git a/Source/Game/Movement/MotionMaster.cs b/Source/Game/Movement/MotionMaster.cs
index 19af0bf82..0a7c3d212 100644
--- a/Source/Game/Movement/MotionMaster.cs
+++ b/Source/Game/Movement/MotionMaster.cs
@@ -545,10 +545,10 @@ namespace Game.Movement
                 Add(new FollowMovementGenerator(target, SharedConst.PetFollowDist, new ChaseAngle(SharedConst.PetFollowAngle)));
         }
 
-        public void MoveRandom(float wanderDistance = 0.0f)
+        public void MoveRandom(float wanderDistance = 0.0f, TimeSpan? duration = null)
         {
             if (_owner.IsTypeId(TypeId.Unit))
-                Add(new RandomMovementGenerator(wanderDistance), MovementSlot.Default);
+                Add(new RandomMovementGenerator(wanderDistance, duration), MovementSlot.Default);
         }
 
         public void MoveFollow(Unit target, float dist, float angle = 0.0f, MovementSlot slot = MovementSlot.Active) { MoveFollow(target, dist, new ChaseAngle(angle), slot); }