*Fix melee spell range issue.

*Revert the change of lifebloom final heal.

--HG--
branch : trunk

2 files changed, 3 insertions, 2 deletions

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 033eb934504..49a70082c35 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -4696,7 +4696,8 @@ uint8 Spell::CheckRange(bool strict)
     {
         if(range_type == SPELL_RANGE_MELEE)
         {
-            if(!m_caster->IsWithinMeleeRange(target, max_range - 2*MIN_MELEE_REACH))
+            // Because of lag, we can not check too strictly here.
+            if(!m_caster->IsWithinMeleeRange(target, max_range/* - 2*MIN_MELEE_REACH*/))
                 return SPELL_FAILED_OUT_OF_RANGE;
         }
         else if(!m_caster->IsWithinCombatRange(target, max_range))
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 742accf567f..794a54f6788 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -2108,7 +2108,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                 {
                     if (GetAuraDuration() <= 0 || m_removeMode==AURA_REMOVE_BY_DISPEL)
                     {
-                        int32 bp0 = GetModifierValue();
+                        int32 bp0 = m_modifier.m_amount; //GetModifierValue();
 						m_target->CastCustomSpell(m_target,33778,&bp0,NULL,NULL,true,NULL,this,GetCasterGUID());
                     }
                 }