From c328eb6b10ac9c09552f6ba54f2b9745cde03aad Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 7 Jan 2018 20:35:24 +0100 Subject: [PATCH] typo fix --- .../Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index c0355b4474..72d4ee7de6 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -281,7 +281,7 @@ class boss_halion : public CreatureScript void DamageTaken(Unit* attacker, uint32& damage) override { - if (damage > me->GetHealth() && !events.IsInPhase(PHASE_THREE)) + if (damage >= me->GetHealth() && !events.IsInPhase(PHASE_THREE)) damage = me->GetHealth() - 1; if (me->HealthBelowPctDamaged(75, damage) && events.IsInPhase(PHASE_ONE)) @@ -467,6 +467,8 @@ class boss_twilight_halion : public CreatureScript void DamageTaken(Unit* attacker, uint32& damage) override { + if (damage >= me->GetHealth() && !events.IsInPhase(PHASE_THREE)) + damage = me->GetHealth() - 1; //Needed because we already have UNIT_FLAG_IN_COMBAT, otherwise JustEngagedWith won't ever be called if (!events.IsInPhase(PHASE_TWO) && !events.IsInPhase(PHASE_THREE)) JustEngagedWith(attacker);