aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2018-01-07 20:35:24 +0100
committerTreeston <treeston.mmoc@gmail.com>2018-01-07 20:35:24 +0100
commit663a6f2f23b8e17401262da7eab05fef2a823b3d (patch)
tree20d7a10effb11115c1a3729be7ac8f0e169277b1
parent9ad11e67fb6b410f18031ee68259866ea1354c8c (diff)
typo fix
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
index e504de68f6e..5c8db0183f3 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -280,7 +280,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))
@@ -463,6 +463,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);