diff options
| -rw-r--r-- | sql/updates/1905_world.sql | 4 | ||||
| -rw-r--r-- | sql/updates/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 4 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 10 |
4 files changed, 16 insertions, 3 deletions
diff --git a/sql/updates/1905_world.sql b/sql/updates/1905_world.sql new file mode 100644 index 00000000000..91b2ab5135f --- /dev/null +++ b/sql/updates/1905_world.sql @@ -0,0 +1,4 @@ +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 8ad00dcd843..106c383a41e 100644 --- a/sql/updates/CMakeLists.txt +++ b/sql/updates/CMakeLists.txt @@ -84,4 +84,5 @@ INSTALL(FILES 1884_world.sql 1886_world.sql 1895_world.sql +1905_world.sql DESTINATION share/trinity/sql/updates)
\ No newline at end of file diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 16a2efef8b3..3946eaddb5c 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -443,8 +443,6 @@ 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); } @@ -3704,7 +3702,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)->CreateSeer(dynObj); + ((Player*)m_caster)->SetSeer(dynObj); //((Player*)m_caster)->UpdateVisibilityOf(dynObj); } diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index eb20ee91845..aa4ff05828a 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5594,6 +5594,16 @@ 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 |