From 351ef2b77f62d1f2284e3765ac20cbac72aee7e8 Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Sun, 31 Jul 2022 12:31:32 -0300
Subject: [PATCH] fix(Scripts/RuinsOfAhnQiraj): Despawn Ayamiss summons on
 death/reset (#12550)

---
 .../scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp  | 10 ++++++++++
 .../RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp     |  7 +------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
index d1198e820..d4e481701 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
@@ -102,6 +102,8 @@ public:
                     }
                     break;
             }
+
+            summons.Summon(who);
         }
 
         void MovementInform(uint32 type, uint32 id) override
@@ -257,6 +259,14 @@ public:
             }
         }
 
+        void JustSummoned(Creature* summon) override
+        {
+            if (Creature* ayamiss = _instance->GetCreature(DATA_AYAMISS))
+            {
+                ayamiss->AI()->JustSummoned(summon);
+            }
+        }
+
         void MoveInLineOfSight(Unit* who) override
 
         {
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
index aa088d091..0bbde8ae5 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
@@ -26,6 +26,7 @@ ObjectData const creatureData[] =
     { NPC_BURU,      DATA_BURU      },
     { NPC_KURINNAXX, DATA_KURINNAXX },
     { NPC_RAJAXX,    DATA_RAJAXX    },
+    { NPC_AYAMISS,   DATA_AYAMISS   },
     { NPC_OSSIRIAN,  DATA_OSSIRIAN  },
     { NPC_QUUEZ,     DATA_QUUEZ     },
     { NPC_TUUBID,    DATA_TUUBID    },
@@ -90,9 +91,6 @@ public:
                 case NPC_BURU:
                     _buruGUID = creature->GetGUID();
                     break;
-                case NPC_AYAMISS:
-                    _ayamissGUID = creature->GetGUID();
-                    break;
                 case NPC_OSSIRIAN:
                     _ossirianGUID = creature->GetGUID();
                     break;
@@ -186,8 +184,6 @@ public:
                     return _moamGUID;
                 case DATA_BURU:
                     return _buruGUID;
-                case DATA_AYAMISS:
-                    return _ayamissGUID;
                 case DATA_OSSIRIAN:
                     return _ossirianGUID;
                 case DATA_PARALYZED:
@@ -285,7 +281,6 @@ public:
         ObjectGuid _rajaxxGUID;
         ObjectGuid _moamGUID;
         ObjectGuid _buruGUID;
-        ObjectGuid _ayamissGUID;
         ObjectGuid _ossirianGUID;
         ObjectGuid _paralyzedGUID;
         uint32 _rajaxWaveCounter;