*Merge.

--HG--
branch : trunk

1 files changed, 7 insertions, 0 deletions

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index b95f7cdc793..e19f2fc42ed 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -436,6 +436,13 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                     if(unitTarget->HasAuraState(AURA_STATE_IMMOLATE))
                         damage += int32(damage*0.25f);
                 }
+                // Haunt
+                else if (m_spellProto->SpellFamilyFlags[1] & 0x40000)
+                {
+                    // Save damage for future healing
+                    // TODO: Implement spell proc on aura expire
+                    m_currentBasePoints[1] = int32(damage * m_currentBasePoints[1] / 100);
+                }
 
                 // Conflagrate - consumes immolate
                 if (m_spellInfo->TargetAuraState == AURA_STATE_IMMOLATE)