From 2db7d810e3b730164e8e136597d14c7cd2458f72 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Tue, 30 Jul 2019 17:43:47 +0200 Subject: [PATCH] Core/Spells: allow PROC_HIT_INTERRUPT also getting triggered by melee spells *fixed Rude Interruption talent (fix by @Keader) --- sql/updates/world/custom/custom_2019_07_30_00_world.sql | 3 +++ src/server/game/Spells/SpellEffects.cpp | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/custom/custom_2019_07_30_00_world.sql diff --git a/sql/updates/world/custom/custom_2019_07_30_00_world.sql b/sql/updates/world/custom/custom_2019_07_30_00_world.sql new file mode 100644 index 0000000000..ed8e77a05b --- /dev/null +++ b/sql/updates/world/custom/custom_2019_07_30_00_world.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_proc` WHERE `SpellId`=-61216; +INSERT INTO `spell_proc` (`SpellId`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `ProcFlags`, `SpellTypeMask`, `SpellPhaseMask`, `HitMask`, `AttributesMask`, `ProcsPerMinute`, `Chance`, `Cooldown`, `Charges`) VALUES +(-61216, 0, 4, 8, 0, 0, 0, 4, 2, 4096, 0, 0, 0, 0, 0); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index d714ffdbac..2a20853993 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3045,7 +3045,9 @@ void Spell::EffectInterruptCast(SpellEffIndex effIndex) { int32 duration = m_spellInfo->GetDuration(); unitTarget->GetSpellHistory()->LockSpellSchool(curSpellInfo->GetSchoolMask(), unitTarget->ModSpellDuration(m_spellInfo, unitTarget, duration, false, 1 << effIndex)); - m_originalCaster->ProcSkillsAndAuras(unitTarget, PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_NEG, PROC_FLAG_TAKEN_SPELL_MAGIC_DMG_CLASS_NEG, PROC_SPELL_TYPE_MASK_ALL, PROC_SPELL_PHASE_HIT, PROC_HIT_INTERRUPT, nullptr, nullptr, nullptr); + m_originalCaster->ProcSkillsAndAuras(unitTarget, PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_NEG | PROC_FLAG_DONE_SPELL_MELEE_DMG_CLASS, + PROC_FLAG_TAKEN_SPELL_MAGIC_DMG_CLASS_NEG | PROC_FLAG_TAKEN_SPELL_MELEE_DMG_CLASS, PROC_SPELL_TYPE_MASK_ALL, + PROC_SPELL_PHASE_HIT, PROC_HIT_INTERRUPT, nullptr, nullptr, nullptr); } ExecuteLogEffectInterruptCast(effIndex, unitTarget, curSpellInfo->Id); unitTarget->InterruptSpell(CurrentSpellTypes(i), false);