this should be it

Author: ccrs

src/server/game/AI/CoreAI/GuardAI.cpp

@@ -50,7 +50,7 @@ bool GuardAI::CanSeeAlways(WorldObject const* obj)
     return false;
 }
 
-void GuardAI::EnterEvadeMode(EvadeReason /*why*/)
+void GuardAI::EnterEvadeMode(EvadeReason why)
 {
     if (!me->IsAlive())
     {
@@ -66,7 +66,8 @@ void GuardAI::EnterEvadeMode(EvadeReason /*why*/)
     me->CombatStop(true);
     EngagementOver();
 
-    me->GetMotionMaster()->MoveTargetedHome();
+    if (why != EVADE_REASON_VEHICLE_EVADE)
+        me->GetMotionMaster()->MoveTargetedHome();
 }
 
 void GuardAI::JustDied(Unit* killer)

src/server/game/AI/CreatureAI.cpp

@@ -218,6 +218,12 @@ void CreatureAI::EnterEvadeMode(EvadeReason why)
 
     TC_LOG_DEBUG("scripts.ai", "CreatureAI::EnterEvadeMode: entering evade mode (why: {}) ({})", why, me->GetGUID().ToString());
 
+    if (why == EVADE_REASON_VEHICLE_EVADE)
+    {
+        Reset();
+        return;
+    }
+
     if (!me->GetVehicle()) // otherwise me will be in evade mode forever
     {
         if (Unit* owner = me->GetCharmerOrOwner())

src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp

@@ -93,14 +93,20 @@ void EscortAI::ReturnToLastPoint()
     me->GetMotionMaster()->MovePoint(POINT_LAST_POINT, me->GetHomePosition());
 }
 
-void EscortAI::EnterEvadeMode(EvadeReason /*why*/)
+void EscortAI::EnterEvadeMode(EvadeReason why)
 {
     me->RemoveAllAuras();
     me->CombatStop(true);
     me->SetLootRecipient(nullptr);
 
     EngagementOver();
 
+    if (why == EVADE_REASON_VEHICLE_EVADE)
+    {
+        Reset();
+        return;
+    }
+
     if (HasEscortState(STATE_ESCORT_ESCORTING))
     {
         AddEscortState(STATE_ESCORT_RETURNING);

src/server/game/AI/SmartScripts/SmartAI.cpp

@@ -393,7 +393,7 @@ void SmartAI::MovementInform(uint32 type, uint32 id)
         _OOCReached = true;
 }
 
-void SmartAI::EnterEvadeMode(EvadeReason /*why*/)
+void SmartAI::EnterEvadeMode(EvadeReason why)
 {
     if (_evadeDisabled)
     {
@@ -416,6 +416,9 @@ void SmartAI::EnterEvadeMode(EvadeReason /*why*/)
 
     SetRun(_run);
 
+    if (why == EVADE_REASON_VEHICLE_EVADE)
+        return;
+
     if (Unit* owner = me->GetCharmerOrOwner())
     {
         me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);