From aebf308368a39a8b7041a076eb02ffe84cd5afe4 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sat, 28 Aug 2021 19:53:53 +0200
Subject: Core/Spells: Fixed Spell::EffectWeaponDmg for spells with multiple
 damage effects

Closes #26717
---
 src/server/game/Spells/SpellEffects.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 192e392b3f5..778cbaa622e 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -2798,8 +2798,9 @@ void Spell::EffectWeaponDmg()
     // multiple weapon dmg effect workaround
     // execute only the last weapon damage
     // and handle all effects at once
-    for (SpellEffectInfo const* effect : m_spellInfo->GetEffects())
+    for (size_t j = effectInfo->EffectIndex + 1; j < m_spellInfo->GetEffects().size(); ++j)
     {
+        SpellEffectInfo const* effect = m_spellInfo->GetEffect(j);
         if (!effect)
             continue;
         switch (effect->Effect)
-- 
cgit v1.2.3