Core/Creatures: Implemented CREATURE_STATIC_FLAG_5_NO_LEAVECOMBAT_STATE_RESTORE

src/server/game/AI/CreatureAI.cpp

@@ -304,6 +304,7 @@ bool CreatureAI::_EnterEvadeMode(EvadeReason /*why*/)
         return false;
     }
 
+    if (me->IsStateRestoredOnEvade())
         me->RemoveAurasOnEvade();
 
     me->CombatStop(true);

src/server/game/Entities/Creature/Creature.h

@@ -170,6 +170,9 @@ class TC_GAME_API Creature : public Unit, public GridObject<Creature>, public Ma
         bool IsInEvadeMode() const { return HasUnitState(UNIT_STATE_EVADE); }
         bool IsEvadingAttacks() const { return IsInEvadeMode() || CanNotReachTarget(); }
 
+        bool IsStateRestoredOnEvade() const { return !HasFlag(CREATURE_STATIC_FLAG_5_NO_LEAVECOMBAT_STATE_RESTORE); }
+        void SetRestoreStateOnEvade(bool restoreOnEvade) { _staticFlags.ApplyFlag(CREATURE_STATIC_FLAG_5_NO_LEAVECOMBAT_STATE_RESTORE, !restoreOnEvade); }
+
         bool AIM_Destroy();
         bool AIM_Create(CreatureAI* ai = nullptr);
         bool AIM_Initialize(CreatureAI* ai = nullptr);

src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp

@@ -80,15 +80,19 @@ template<>
 void HomeMovementGenerator<Creature>::DoFinalize(Creature* owner)
 {
     if (_arrived)
+    {
+        if (owner->IsStateRestoredOnEvade())
         {
             owner->ClearUnitState(UNIT_STATE_EVADE);
             owner->SetWalk(true);
             owner->InitializeMovementCapabilities();
+            owner->SetSpawnHealth();
             owner->LoadCreaturesAddon();
             if (owner->IsVehicle())
                 owner->GetVehicleKit()->Reset(true);
+        }
+
         owner->AI()->JustReachedHome();
-        owner->SetSpawnHealth();
     }
 }