From 4e9148799f7eca6accc6b599b5103d4a81e6c442 Mon Sep 17 00:00:00 2001
From: Andrew <47818697+Nyeriah@users.noreply.github.com>
Date: Mon, 24 Mar 2025 14:16:22 -0300
Subject: [PATCH] =?UTF-8?q?fix(Scripts/SunwellPlateau):=20Remove=20despawn?=
 =?UTF-8?q?=20on=20evade=20flag=20from=20KJ=20and=E2=80=A6=20(#21753)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/sql/updates/pending_db_world/rev_1742696079168623800.sql   | 2 ++
 .../scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp   | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1742696079168623800.sql

diff --git a/data/sql/updates/pending_db_world/rev_1742696079168623800.sql b/data/sql/updates/pending_db_world/rev_1742696079168623800.sql
new file mode 100644
index 000000000..0a55b677b
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1742696079168623800.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `flags_extra` = `flags_extra` &~2147483648 WHERE `entry` = 25315;
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index cd2ab0e1a..0fbfb4b8c 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -450,6 +450,7 @@ struct boss_kiljaeden : public BossAI
         if (me->GetReactState() == REACT_PASSIVE)
             return;
         ScriptedAI::EnterEvadeMode(why);
+        me->DespawnOrUnsummon();
     }
 
     void AttackStart(Unit* who) override