From d26d09c3587666c1a5da771e938c143e18d89030 Mon Sep 17 00:00:00 2001
From: Rocco Silipo <108557877+Rorschach91@users.noreply.github.com>
Date: Thu, 5 Jun 2025 16:45:56 +0200
Subject: [PATCH] fix(Scripts/ScarletEnclave): Death Knight Initiates now
 despawn when defeated. (#22268)

---
 data/sql/updates/pending_db_world/DK_Remove_auras.sql       | 6 ++++++
 .../scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 data/sql/updates/pending_db_world/DK_Remove_auras.sql

diff --git a/data/sql/updates/pending_db_world/DK_Remove_auras.sql b/data/sql/updates/pending_db_world/DK_Remove_auras.sql
new file mode 100644
index 000000000..84a24bfae
--- /dev/null
+++ b/data/sql/updates/pending_db_world/DK_Remove_auras.sql
@@ -0,0 +1,6 @@
+
+-- Remove Wrong Auras
+UPDATE `creature_addon` SET `auras` = '' WHERE (`guid` IN (129492, 129496, 129497, 129498, 129499));
+
+-- Remove Wrong Unit Flags (Immune to npc and pc "Sniffs")
+UPDATE `creature_template` SET `unit_flags` = `unit_flags` &~(256|512) WHERE (`entry` = 28406);
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 2a5816d74..30d1cb8c7 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -131,7 +131,6 @@ public:
             if (creature->AI()->GetData(DATA_IN_PROGRESS))
                 return true;
 
-            creature->SetImmuneToPC(false);
             creature->RemoveUnitFlag(UNIT_FLAG_SWIMMING);
 
             player->CastSpell(creature, SPELL_DUEL, false);
@@ -231,6 +230,7 @@ public:
                     me->RemoveAllAuras();
                     me->CastSpell(attacker, SPELL_DUEL_VICTORY, true);
                     me->RestoreFaction();
+                    me->DespawnOrUnsummon(10000);
                 }
             }
         }