From 545bee04961450465a851196412f56b5578d9837 Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Thu, 10 Jan 2019 19:21:20 +0100 Subject: Scripts/Spells: Fix infinite loop in Power Word Shield (#22918) Fix infinite loop in Power Word Shield triggering back and forth the damage spell between 2 players, both with Power Word Shield --- src/server/scripts/Spells/spell_priest.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index ed4a7c0d714..4b0547e6d3b 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -1029,6 +1029,10 @@ class spell_pri_power_word_shield : public SpellScriptLoader if (dmgInfo.GetAttacker() == target) return; + // Don't try to reflect the reflect spell + if (dmgInfo.GetSpellInfo() && dmgInfo.GetSpellInfo()->Id == SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED) + return; + if (AuraEffect* talentAurEff = target->GetAuraEffectOfRankedSpell(SPELL_PRIEST_REFLECTIVE_SHIELD_R1, EFFECT_0)) { CastSpellExtraArgs args(aurEff); -- cgit v1.2.3