aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/163_world.sql2
-rw-r--r--src/game/SpellAuras.cpp5
-rw-r--r--src/game/SpellEffects.cpp3
3 files changed, 5 insertions, 5 deletions
diff --git a/sql/updates/163_world.sql b/sql/updates/163_world.sql
index da0b03c9a04..00c33703363 100644
--- a/sql/updates/163_world.sql
+++ b/sql/updates/163_world.sql
@@ -1,5 +1,5 @@
DELETE FROM spell_linked_spell WHERE `spell_trigger` IN (39992, 39835, 42052, -41914, 41126);
---INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (39992, 39835, 1, 'Needle Spine');
+-- INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (39992, 39835, 1, 'Needle Spine');
INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (39835, 39968, 1, 'Needle Spine');
INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-41914, 41915, 0, 'Summon Parasitic Shadowfiend');
INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (41126, 41131, 1, 'Flame Crash');
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 21d224ea0e4..9fd8ba42baf 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -1880,7 +1880,8 @@ void Aura::TriggerSpell()
}
}
}
- // All ok cast by default case
+ m_target->CastSpell(target, triggredSpellInfo, true, 0, this, originalCasterGUID);
+ /*// All ok cast by default case
Spell *spell = new Spell(m_target, triggredSpellInfo, true, originalCasterGUID );
SpellCastTargets targets;
@@ -1890,7 +1891,7 @@ void Aura::TriggerSpell()
if(DynamicObject* dynObj = caster->GetDynObject(GetId()))
targets.setDestination(dynObj->GetPositionX(),dynObj->GetPositionY(),dynObj->GetPositionZ());
- spell->prepare(&targets, this);
+ spell->prepare(&targets, this);*/
}
/*********************************************************/
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index db7134c375c..6aa85b976d7 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -57,7 +57,6 @@
#include "Util.h"
#include "TemporarySummon.h"
-
pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
{
&Spell::EffectNULL, // 0
@@ -223,7 +222,7 @@ void Spell::EffectNULL(uint32 /*i*/)
void Spell::EffectUnused(uint32 /*i*/)
{
- // NOT USED BY ANY SPELL OR USELESS OR IMPLEMENTED IN DIFFERENT WAY IN TRINITY
+ // NOT USED BY ANY SPELL OR USELESS OR IMPLEMENTED IN DIFFERENT WAY IN MANGOS
}
void Spell::EffectResurrectNew(uint32 i)