From 49c2eabea109bce35c98b84676f6318595345a2b Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Sun, 13 Aug 2023 13:51:43 -0300
Subject: [PATCH] fix(Scripts/Karazhan): Fix Servant Quarters rares not
 spawning (#17001)

* fix(Scripts/Karazhan): Fix Servant Quarters rares not spawning

* Update rev_1691944209332122100.sql
---
 .../rev_1691944209332122100.sql               |  3 +++
 .../Karazhan/boss_servant_quarters.cpp        | 21 +------------------
 .../EasternKingdoms/Karazhan/karazhan.h       |  7 +++----
 3 files changed, 7 insertions(+), 24 deletions(-)
 create mode 100644 data/sql/updates/pending_db_world/rev_1691944209332122100.sql

diff --git a/data/sql/updates/pending_db_world/rev_1691944209332122100.sql b/data/sql/updates/pending_db_world/rev_1691944209332122100.sql
new file mode 100644
index 000000000..b8b61698d
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1691944209332122100.sql
@@ -0,0 +1,3 @@
+--
+DELETE FROM `creature` WHERE `id1` IN (16179, 16180, 16181);
+DELETE FROM `linked_respawn` WHERE `guid` = 135369;
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
index 0c23ed406..4dd8dbb76 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
@@ -40,30 +40,11 @@ struct boss_servant_quarters : public BossAI
     void Reset() override
     {
         _scheduler.CancelAll();
-        me->SetVisible(false);
-        me->SetReactState(REACT_PASSIVE);
-        me->SetFaction(FACTION_FRIENDLY);
-        _scheduler.Schedule(5s, [this](TaskContext context)
-        {
-            if (instance->GetBossState(DATA_SERVANT_QUARTERS) == DONE)
-            {
-                me->SetVisible(true);
-                me->SetReactState(REACT_AGGRESSIVE);
-                me->RestoreFaction();
-            }
-            else
-            {
-                context.Repeat(5s);
-            }
-        });
+
         if (me->GetEntry() == NPC_HYAKISS_THE_LURKER)
         {
             DoCastSelf(SPELL_SNEAK, true);
         }
-        if (instance->GetData(DATA_SELECTED_RARE) != me->GetEntry())
-        {
-            me->DespawnOrUnsummon(1);
-        }
     }
 
     void JustEngagedWith(Unit*  /*who*/) override
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
index c3688ecdd..86cf16fbe 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
@@ -40,11 +40,10 @@ enum KZDataTypes
     DATA_MALCHEZZAR                 = 10,
     DATA_NIGHTBANE                  = 11,
     DATA_SERVANT_QUARTERS           = 12,
-    DATA_SELECTED_RARE              = 13,
-    DATA_OPERA_OZ_DEATHCOUNT        = 14,
-    DATA_KILREK                     = 15,
+    DATA_OPERA_OZ_DEATHCOUNT        = 13,
+    DATA_KILREK                     = 14,
 
-    MAX_ENCOUNTERS                  = 16,
+    MAX_ENCOUNTERS                  = 15,
 
     DATA_GO_CURTAINS                = 18,
     DATA_GO_STAGEDOORLEFT           = 19,