fix(Scripts/ZulGurub): fix Thekal not dying in phase 2 (#12353)

This commit is contained in:
Skjalf
2022-07-10 18:08:48 -03:00
committed by GitHub
parent e7500d37ff
commit 6b2361312c

View File

@@ -144,7 +144,7 @@ public:
CheckPhaseTransition(); CheckPhaseTransition();
_scheduler.Schedule(10s, [this, data](TaskContext /*context*/) { _scheduler.Schedule(10s, [this, data](TaskContext /*context*/) {
if ((!_lorkhanDied || !_zathDied) && !WasDead) if (!_lorkhanDied || !_zathDied || !WasDead)
{ {
ReviveZealot(data); ReviveZealot(data);
} }
@@ -153,7 +153,7 @@ public:
void DamageTaken(Unit* /*attacker*/, uint32& damage, DamageEffectType, SpellSchoolMask) override 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; 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); DoCastSelf(SPELL_ENRAGE);
Enraged = true; Enraged = true;
@@ -204,6 +204,7 @@ public:
if (Creature* zealot = instance->GetCreature(zealotData)) if (Creature* zealot = instance->GetCreature(zealotData))
{ {
zealot->Respawn(true); zealot->Respawn(true);
zealot->SetInCombatWithZone();
UpdateZealotStatus(zealotData, false); UpdateZealotStatus(zealotData, false);
} }
} }