From dd2167b00b138e97ff71cf04b54e2de147bb7089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A9=E9=B9=BF?=
 <18535853+PkllonG@users.noreply.github.com>
Date: Sat, 7 Sep 2024 12:03:19 +0800
Subject: [PATCH] fix(Core/AI): Creature SetInCombatState Leashing. (#19889)

* Update Unit.cpp

* Update pit_of_saron.cpp

* Update Unit.cpp
---
 src/server/game/Entities/Unit/Unit.cpp                        | 4 ++--
 .../scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index df843dabe..1f0dd7832 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -13541,8 +13541,6 @@ void Unit::SetInCombatWith(Unit* enemy, uint32 duration)
             return;
         }
     }
-    if (Creature* pCreature = ToCreature())
-        pCreature->UpdateLeashExtensionTime();
 
     SetInCombatState(false, enemy, duration);
 }
@@ -13701,6 +13699,8 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy, uint32 duration)
 
         if (enemy)
         {
+            creature->UpdateLeashExtensionTime();
+
             if (IsAIEnabled)
                 creature->AI()->JustEngagedWith(enemy);
 
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
index 515476bfd..578a4e3af 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
@@ -1130,7 +1130,7 @@ public:
             me->LoadCreaturesAddon(true);
             me->SetLootRecipient(nullptr);
             me->ResetPlayerDamageReq();
-            me->UpdateLeashExtensionTime();
+            me->ClearLastLeashExtensionTimePtr();
         }
     };