*Merge

--HG--
branch : trunk

1 files changed, 3 insertions, 1 deletions

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index e33a79908f5..9400f61917b 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -443,6 +443,8 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                 // Haunt
                 else if (m_spellInfo->SpellFamilyFlags[1] & 0x40000)
                 {
+                    // Save damage for future healing
+                    // TODO: Implement spell proc on aura expire
                     m_currentBasePoints[1] = int32(damage * m_currentBasePoints[1] / 100);
                 }
 
@@ -3702,7 +3704,7 @@ void Spell::EffectAddFarsight(uint32 i)
     dynObj->GetMap()->Add(dynObj); //grid will also be loaded
 
     // Need to update visibility of object for client to accept farsight guid
-    ((Player*)m_caster)->SetSeer(dynObj);
+    ((Player*)m_caster)->CreateSeer(dynObj);
     //((Player*)m_caster)->UpdateVisibilityOf(dynObj);
 }