From 6b2361312c898b9a7bec2dc0da8ae72dbebe1d8a Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Sun, 10 Jul 2022 18:08:48 -0300
Subject: [PATCH] fix(Scripts/ZulGurub): fix Thekal not dying in phase 2 
 (#12353)

---
 .../scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
index de71c138f..1b7bd7064 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
@@ -144,7 +144,7 @@ public:
             CheckPhaseTransition();
 
             _scheduler.Schedule(10s, [this, data](TaskContext /*context*/) {
-                if ((!_lorkhanDied || !_zathDied) && !WasDead)
+                if (!_lorkhanDied || !_zathDied || !WasDead)
                 {
                     ReviveZealot(data);
                 }
@@ -153,7 +153,7 @@ public:
 
         void DamageTaken(Unit* /*attacker*/, uint32& damage, DamageEffectType, SpellSchoolMask) override
         {
-            if (me->GetEntry() == NPC_HIGH_PRIEST_THEKAL && damage >= me->GetHealth())
+            if (!me->HasAura(SPELL_TIGER_FORM) && damage >= me->GetHealth())
             {
                 damage = me->GetHealth() - 1;
 
@@ -170,7 +170,7 @@ public:
                 }
             }
 
-            if (!Enraged && me->HealthBelowPctDamaged(20, damage) && me->GetEntry() != NPC_HIGH_PRIEST_THEKAL)
+            if (!Enraged && me->HealthBelowPctDamaged(20, damage) && me->HasAura(SPELL_TIGER_FORM))
             {
                 DoCastSelf(SPELL_ENRAGE);
                 Enraged = true;
@@ -204,6 +204,7 @@ public:
             if (Creature* zealot = instance->GetCreature(zealotData))
             {
                 zealot->Respawn(true);
+                zealot->SetInCombatWithZone();
                 UpdateZealotStatus(zealotData, false);
             }
         }