Merge pull request #14709 from et65/6.x

Core/Spells: Fix logic in SpellEffect::EffectWeaponDmg

1 files changed, 2 insertions, 1 deletions

diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 97e82426e9d..758b1cd6f6d 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -2934,8 +2934,9 @@ void Spell::EffectWeaponDmg(SpellEffIndex /*effIndex*/)
     // multiple weapon dmg effect workaround
     // execute only the last weapon damage
     // and handle all effects at once
-    for (SpellEffectInfo const* effect : GetEffects())
+    for (uint8 index = effIndex + 1; index < MAX_SPELL_EFFECTS; index++)
     {
+        SpellEffectInfo const* effect = GetEffect(index);
         if (!effect)
             continue;
         switch (effect->Effect)