From 6ceb40727375c3c345f1b65181f4ae713caa41af Mon Sep 17 00:00:00 2001 From: ariel- Date: Mon, 30 Jan 2017 02:43:24 -0300 Subject: [PATCH] Core/Scripts: fix penance procs with Unchained magic Closes #19005 --- sql/updates/world/3.3.5/2017_01_30_00_world.sql | 2 ++ src/server/scripts/Spells/spell_priest.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 sql/updates/world/3.3.5/2017_01_30_00_world.sql diff --git a/sql/updates/world/3.3.5/2017_01_30_00_world.sql b/sql/updates/world/3.3.5/2017_01_30_00_world.sql new file mode 100644 index 0000000000..5cddcc8233 --- /dev/null +++ b/sql/updates/world/3.3.5/2017_01_30_00_world.sql @@ -0,0 +1,2 @@ +-- Unchained Magic +UPDATE `spell_proc` SET `ProcFlags`=0x15400 WHERE `SpellId`=69762; diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 284090b770..f17cbbcded 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -813,9 +813,9 @@ class spell_pri_penance : public SpellScriptLoader uint8 rank = GetSpellInfo()->GetRank(); if (caster->IsFriendlyTo(unitTarget)) - caster->CastSpell(unitTarget, sSpellMgr->GetSpellWithRank(SPELL_PRIEST_PENANCE_R1_HEAL, rank), false); + caster->CastSpell(unitTarget, sSpellMgr->GetSpellWithRank(SPELL_PRIEST_PENANCE_R1_HEAL, rank), TRIGGERED_DISALLOW_PROC_EVENTS); else - caster->CastSpell(unitTarget, sSpellMgr->GetSpellWithRank(SPELL_PRIEST_PENANCE_R1_DAMAGE, rank), false); + caster->CastSpell(unitTarget, sSpellMgr->GetSpellWithRank(SPELL_PRIEST_PENANCE_R1_DAMAGE, rank), TRIGGERED_DISALLOW_PROC_EVENTS); } }