From 1ceda14d54da6108fab59621aa3e4e898f76f42f Mon Sep 17 00:00:00 2001
From: p0wer <none@none>
Date: Sun, 28 Feb 2010 14:46:15 -0600
Subject: [PATCH] Change the conditional statement for Merciless Combat so it
 correctly applies extra damage when required. Fixes #860.

--HG--
branch : trunk
---
 src/game/Unit.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 644b2430b6..bc22087a0d 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -9841,7 +9841,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
                 // Merciless Combat
                 if ((*i)->GetSpellProto()->SpellIconID == 2656)
                 {
-                    if (pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, spellProto, this))
+                    if ((pVictim->GetMaxHealth() * 35 / 100) >= pVictim->GetHealth())
                         DoneTotalMod *= (100.0f+(*i)->GetAmount())/100.0f;
                 }
                 // Tundra Stalker
@@ -11043,8 +11043,8 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage, WeaponAttackType att
             {
                 // Merciless Combat
                 if ((*i)->GetSpellProto()->SpellIconID == 2656)
-                {
-                    if (pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, spellProto, this))
+                {  
+                    if ((pVictim->GetMaxHealth() * 35 / 100) >= pVictim->GetHealth())
                         DoneTotalMod *= (100.0f+(*i)->GetAmount())/100.0f;
                 }
                 // Tundra Stalker