From 50b50563cec2a03c285f7f24f524b8b2c653860f Mon Sep 17 00:00:00 2001 From: et65 Date: Sat, 16 May 2015 15:36:13 +0200 Subject: Core/Spells: Fix logic in SpellEffect::EffectWeaponDmg, it should fix SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE, SPELL_EFFECT_WEAPON_DAMAGE and SPELL_EFFECT_NORMALIZED_WEAPON_DMG. Closes: #14675 --- 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 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) -- cgit v1.2.3