From af3449e06463b3425df2ce67195fa55492af4151 Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Tue, 25 Sep 2018 19:22:23 +0200
Subject: Scripts/BlackrockSpire: Fix infinite loop in Gyth fight

Fix infinite loop in Gyth fight and double event caused by Rend Blackhand being respawned.
Please note this event is completely bugged and unfinished and contains for sure more bugs.
---
 .../BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp        | 2 +-
 .../BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/server/scripts')

diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
index 899b4379fc2..20f201e5b99 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
@@ -235,7 +235,7 @@ public:
                     case 11:
                         if (Creature* gyth = me->FindNearestCreature(NPC_GYTH, 10.0f, true))
                             gyth->AI()->SetData(1, 1);
-                        me->DespawnOrUnsummon(1000);
+                        me->DespawnOrUnsummon(1000, 24h * 7);
                         break;
                 }
             }
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
index b252e84b81d..e3602f13a4d 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
@@ -95,12 +95,12 @@ public:
                 case NPC_PYROGAURD_EMBERSEER:
                     PyroguardEmberseer = creature->GetGUID();
                     if (GetBossState(DATA_PYROGAURD_EMBERSEER) == DONE)
-                        creature->DisappearAndDie();
+                        creature->DespawnOrUnsummon(0, 24h * 7);
                     break;
                 case NPC_WARCHIEF_REND_BLACKHAND:
                     WarchiefRendBlackhand = creature->GetGUID();
                     if (GetBossState(DATA_GYTH) == DONE)
-                        creature->DisappearAndDie();
+                        creature->DespawnOrUnsummon(0, 24h * 7);
                     break;
                 case NPC_GYTH:
                     Gyth = creature->GetGUID();
@@ -114,7 +114,7 @@ public:
                 case NPC_LORD_VICTOR_NEFARIUS:
                     LordVictorNefarius = creature->GetGUID();
                     if (GetBossState(DATA_GYTH) == DONE)
-                        creature->DisappearAndDie();
+                        creature->DespawnOrUnsummon(0, 24h * 7);
                     break;
                 case NPC_SCARSHIELD_INFILTRATOR:
                     ScarshieldInfiltrator = creature->GetGUID();
-- 
cgit v1.2.3