*Merge

--HG--
branch : trunk

4 files changed, 3 insertions, 16 deletions

diff --git a/sql/updates/1905_world.sql b/sql/updates/1905_world.sql
deleted file mode 100644
index 91b2ab5135f..00000000000
--- a/sql/updates/1905_world.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-REPLACE INTO `spell_proc_event` VALUES (48181, 0x00, 5, 0x00000000, 262144, 0x00000000, 0x00000000, 0x0002000, 0.000000, 0.000000, 0);
-REPLACE INTO `spell_proc_event` VALUES (59161, 0x00, 5, 0x00000000, 262144, 0x00000000, 0x00000000, 0x0002000, 0.000000, 0.000000, 0);
-REPLACE INTO `spell_proc_event` VALUES (59163, 0x00, 5, 0x00000000, 262144, 0x00000000, 0x00000000, 0x0002000, 0.000000, 0.000000, 0);
-REPLACE INTO `spell_proc_event` VALUES (59164, 0x00, 5, 0x00000000, 262144, 0x00000000, 0x00000000, 0x0002000, 0.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index 3f93983b52c..bfdbdc46d48 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -83,7 +83,6 @@ INSTALL(FILES
 1884_world.sql
 1886_world.sql
 1895_world.sql
-1905_world.sql
 1906_world.sql
 1910_world.sql
 1911_world.sql
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);
 }
 
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 63328727281..48e7aec78c8 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -5610,16 +5610,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
                 basepoints0 = damage * triggerAmount / 100;
                 break;
             }
-            // Haunt
-            if (dummySpell->SpellFamilyFlags[1] & 0x40000)
-            {
-                if(!pVictim || !pVictim->isAlive())
-                    return false;
-
-                basepoints0 = dummySpell->EffectBasePoints[1];
-                triggered_spell_id = 48210;
-                return true;
-            }
             switch(dummySpell->Id)
             {
                 // Nightfall