From 80ac0e64bba890701b60a7848cd93f09470581ef Mon Sep 17 00:00:00 2001
From: Udo <danny337@hotmail.de>
Date: Thu, 18 Sep 2025 01:19:55 +0200
Subject: [PATCH 1/4] Update redridge_mountains.cpp

---
 .../redridge_mountains/redridge_mountains.cpp | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp b/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
index a06d99b2676..b59633c30e4 100644
--- a/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
+++ b/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
@@ -57,12 +57,37 @@ struct npc_corporal_keeshan_escortAI : npc_escortAI
     uint32 m_uiMockingBlowTimer;
     uint32 m_uiShieldBashTimer;
 
+    // --- Respawn/Home Cache ---
+
     void Reset() override
     {
         m_uiMockingBlowTimer = 5000;
         m_uiShieldBashTimer  = 8000;
     }
 
+    void JustRespawned() override
+    {
+        // Reset
+        npc_escortAI::JustRespawned();
+        Reset();                // unsere Timer
+        float m_homeX, m_homeY, m_homeZ, m_homeO;
+
+        //Reset Faction and Quest Giver
+        m_creature->SetFactionTemplateId(FACTION_STORMWIND);
+        m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+
+        // SetSpawn
+        if (m_homeX || m_homeY || m_homeZ)
+        {
+            m_creature->NearTeleportTo(m_homeX, m_homeY, m_homeZ, m_homeO);
+            m_creature->SetHomePosition(m_homeX, m_homeY, m_homeZ, m_homeO);
+        }
+
+        // Clear Movement
+        m_creature->GetMotionMaster()->Clear();
+        m_creature->GetMotionMaster()->MoveTargetedHome();
+    }
+
     void WaypointStart(uint32 uiWP) override
     {
         switch (uiWP)

From 0de05e1c3ba4eaa80c7acd644ae2b0cfbb2a118a Mon Sep 17 00:00:00 2001
From: Udo <danny337@hotmail.de>
Date: Thu, 18 Sep 2025 01:23:10 +0200
Subject: [PATCH 2/4] Update redridge_mountains.cpp

---
 .../eastern_kingdoms/redridge_mountains/redridge_mountains.cpp  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp b/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
index b59633c30e4..c707926d98a 100644
--- a/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
+++ b/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
@@ -57,8 +57,6 @@ struct npc_corporal_keeshan_escortAI : npc_escortAI
     uint32 m_uiMockingBlowTimer;
     uint32 m_uiShieldBashTimer;
 
-    // --- Respawn/Home Cache ---
-
     void Reset() override
     {
         m_uiMockingBlowTimer = 5000;

From 05194816e1ed591d19ff042e3fe632492c727b06 Mon Sep 17 00:00:00 2001
From: Udo <danny337@hotmail.de>
Date: Thu, 18 Sep 2025 01:24:30 +0200
Subject: [PATCH 3/4] Update redridge_mountains.cpp

---
 .../redridge_mountains/redridge_mountains.cpp               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp b/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
index c707926d98a..dceed3660b4 100644
--- a/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
+++ b/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
@@ -65,12 +65,12 @@ struct npc_corporal_keeshan_escortAI : npc_escortAI
 
     void JustRespawned() override
     {
-        // Reset
+        // Reset EscortAI
         npc_escortAI::JustRespawned();
-        Reset();                // unsere Timer
+        Reset(); 
         float m_homeX, m_homeY, m_homeZ, m_homeO;
 
-        //Reset Faction and Quest Giver
+        //Reset Faction and Quest Giver Flag
         m_creature->SetFactionTemplateId(FACTION_STORMWIND);
         m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
 

From 15811d3efa636894ce74610e46e7385c06f74267 Mon Sep 17 00:00:00 2001
From: Udo <danny337@hotmail.de>
Date: Fri, 26 Sep 2025 08:02:14 +0200
Subject: [PATCH 4/4] Remove unnecessary Home Set

---
 .../redridge_mountains/redridge_mountains.cpp             | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp b/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
index dceed3660b4..228d1d19cde 100644
--- a/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
+++ b/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
@@ -68,19 +68,11 @@ struct npc_corporal_keeshan_escortAI : npc_escortAI
         // Reset EscortAI
         npc_escortAI::JustRespawned();
         Reset(); 
-        float m_homeX, m_homeY, m_homeZ, m_homeO;
 
         //Reset Faction and Quest Giver Flag
         m_creature->SetFactionTemplateId(FACTION_STORMWIND);
         m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
 
-        // SetSpawn
-        if (m_homeX || m_homeY || m_homeZ)
-        {
-            m_creature->NearTeleportTo(m_homeX, m_homeY, m_homeZ, m_homeO);
-            m_creature->SetHomePosition(m_homeX, m_homeY, m_homeZ, m_homeO);
-        }
-
         // Clear Movement
         m_creature->GetMotionMaster()->Clear();
         m_creature->GetMotionMaster()->MoveTargetedHome();