diff options
| -rw-r--r-- | sql/updates/2773_world_spell_linked_spell.sql | 6 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sql/updates/2773_world_spell_linked_spell.sql b/sql/updates/2773_world_spell_linked_spell.sql new file mode 100644 index 00000000000..90f5f8de19b --- /dev/null +++ b/sql/updates/2773_world_spell_linked_spell.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (32386, 32388, 32389, 32390, 32391); +INSERT INTO `spell_linked_spell` VALUES (32386, 60448, 1, 'Shadow Embrace Rank1'); +INSERT INTO `spell_linked_spell` VALUES (32388, 60465, 1, 'Shadow Embrace Rank2'); +INSERT INTO `spell_linked_spell` VALUES (32389, 60466, 1, 'Shadow Embrace Rank3'); +INSERT INTO `spell_linked_spell` VALUES (32390, 60467, 1, 'Shadow Embrace Rank4'); +INSERT INTO `spell_linked_spell` VALUES (32391, 60468, 1, 'Shadow Embrace Rank5'); diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index ae468f0fdbb..d321d2d6e31 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -451,6 +451,9 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) // Conflagrate - consumes immolate if (m_spellInfo->TargetAuraState == AURA_STATE_IMMOLATE) { + // Glyph of Conflagrate + if (m_caster->HasAura(56235)) + break; // for caster applied auras only Unit::AuraEffectList const &mPeriodic = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE); for(Unit::AuraEffectList::const_iterator i = mPeriodic.begin(); i != mPeriodic.end(); ++i) |