diff options
| -rw-r--r-- | sql/updates/5950_world.sql | 3 | ||||
| -rw-r--r-- | src/game/Spell.cpp | 12 |
2 files changed, 3 insertions, 12 deletions
diff --git a/sql/updates/5950_world.sql b/sql/updates/5950_world.sql new file mode 100644 index 00000000000..379469682be --- /dev/null +++ b/sql/updates/5950_world.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`='16857'; +INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES +( 16857, 60089, 0, 'Faerie Fire (Feral)'); diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 5301eb4069b..cb0236967ab 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2874,18 +2874,6 @@ void Spell::cast(bool skipCheck) m_preCastSpell = 11196; // Recently Bandaged break; } - case SPELLFAMILY_DRUID: - { - // Faerie Fire (Feral) - if (m_spellInfo->SpellFamilyFlags[0] & 0x00000400) - { - // Trigger only if has correct shapeshift for triggered spell - SpellEntry const * spellInfo = sSpellStore.LookupEntry(60089); - if (GetErrorAtShapeshiftedCast(spellInfo, m_caster->m_form) == SPELL_CAST_OK) - m_preCastSpell = 60089; - } - break; - } } // traded items have trade slot instead of guid in m_itemTargetGUID // set to real guid to be sent later to the client |