From 3a8aae99642a78ec87365c771a5dbd2ffa88258c Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Thu, 22 Jun 2023 09:29:56 -0300
Subject: [PATCH] =?UTF-8?q?fix(Scripts/SlavePens):=20Remove=20the=20Magma?=
 =?UTF-8?q?=20Totem=20requirement=20to=20summoni=E2=80=A6=20(#16602)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(Scripts/SlavePens): Remove the Magma Totem requirement to summoning Ahune
---
 .../SlavePens/boss_ahune.cpp                  | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
index 55cc12d06..a6772b488 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
@@ -109,17 +109,6 @@ public:
         SummonList summons;
         ObjectGuid InvokerGUID;
 
-        bool CanBeSeen(Player const* player) override
-        {
-            if (player->IsGameMaster())
-            {
-                return true;
-            }
-
-            Group const* group = player->GetGroup();
-            return group && sLFGMgr->GetDungeon(group->GetGUID()) == lfg::LFG_DUNGEON_FROST_LORD_AHUNE;
-        }
-
         void StartPhase1()
         {
             me->CastSpell(me, SPELL_AHUNES_SHIELD, true);
@@ -331,8 +320,18 @@ public:
     {
         if (!player || !go)
             return true;
-        if (!player->HasItemCount(ITEM_MAGMA_TOTEM))
-            return true;
+
+        if (!player->IsGameMaster())
+        {
+            if (Group const* group = player->GetGroup())
+            {
+                if (sLFGMgr->GetDungeon(group->GetGUID()) != lfg::LFG_DUNGEON_FROST_LORD_AHUNE)
+                {
+                    return true;
+                }
+            }
+        }
+
         if (go->FindNearestCreature(NPC_AHUNE, 200.0f, true))
             return true;
 
@@ -345,10 +344,20 @@ public:
     {
         if (!player || !go)
             return true;
+
+        if (!player->IsGameMaster())
+        {
+            if (Group const* group = player->GetGroup())
+            {
+                if (sLFGMgr->GetDungeon(group->GetGUID()) != lfg::LFG_DUNGEON_FROST_LORD_AHUNE)
+                {
+                    return true;
+                }
+            }
+        }
+
         if (action != GOSSIP_ACTION_INFO_DEF + 1337)
             return true;
-        if (!player->HasItemCount(ITEM_MAGMA_TOTEM))
-            return true;
         if (go->FindNearestCreature(NPC_AHUNE, 200.0f, true))
             return true;