aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/2687_world.sql2
-rw-r--r--src/game/SpellAuras.cpp18
2 files changed, 19 insertions, 1 deletions
diff --git a/sql/updates/2687_world.sql b/sql/updates/2687_world.sql
index a36a0ddf117..4053afc55f5 100644
--- a/sql/updates/2687_world.sql
+++ b/sql/updates/2687_world.sql
@@ -1,4 +1,4 @@
DELETE FROM `spell_proc_event` WHERE `entry` IN (44545, 44543);
INSERT INTO `spell_proc_event` VALUES
(44545, 0x00, 3, 1049120, 4096, 0, 65536, 0x0000000, 0.000000, 15.000000, 0),
-(44543, 0x00, 3, 1049120, 4096, 0, 65536, 0x0000000, 0.000000, 7.000000, 0),
+(44543, 0x00, 3, 1049120, 4096, 0, 65536, 0x0000000, 0.000000, 7.000000, 0);
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 5479ea7f7c2..e0d52abf3b9 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -2266,6 +2266,12 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real)
{
switch(GetId())
{
+ // Haunting Spirits - perdiodic trigger demon
+ case 7057:
+ m_isPeriodic = true;
+ m_amplitude = irand (0, 60) + 30;
+ m_amplitude *= IN_MILISECONDS;
+ return;
case 1515: // Tame beast
// FIX_ME: this is 2.0.12 threat effect replaced in 2.1.x by dummy aura, must be checked for correctness
if( caster && m_target->CanHaveThreatList())
@@ -6165,6 +6171,18 @@ void AuraEffect::PeriodicTick()
m_target->ModifyPower(pt, m_amount*3/5);
break;
}
+ case SPELL_AURA_DUMMY:
+ {
+ // Haunting Spirits
+ if (GetId() == 7057)
+ {
+ m_target->CastSpell((Unit*) , m_amount , true);
+ m_amplitude = irand (0 , 60 ) + 30;
+ m_amplitude *= IN_MILISECONDS;
+ break;
+ }
+ break;
+ }
// Here tick dummy auras
case SPELL_AURA_PERIODIC_DUMMY:
{