[11141][Patch] Fix SpellMod for melee-ranged spells

[Auntie Mangos]

What bug does the patch fix? What features does the patch add?

Add use of SpellMod for melee spells, as needed ie for Zap, and rogue talents

For which repository revision was the patch created?

11118

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

Bugreport by Feanordev @ http://getmangos.eu/community/post/131365/#p131365

Who has been writing this patch? Please include either forum user names or email addresses.

me

Tested by Feanordev (slightly different version) at http://getmangos.eu/community/post/131482/#p131482

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index ed547cf..025b27f 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -5743,7 +5743,12 @@ SpellCastResult Spell::CheckRange(bool strict)
                    return SPELL_CAST_OK;

                // with additional 5 dist for non stricted case (some melee spells have delay in apply
-                return m_caster->CanReachWithMeleeAttack(target, strict ? 0.0f : 5.0f) ? SPELL_CAST_OK : SPELL_FAILED_OUT_OF_RANGE;
+                float range_mod = strict ? 0.0f : 5.0f;
+                float base = ATTACK_DISTANCE;
+                if (Player* modOwner = m_caster->GetSpellModOwner())
+                    range_mod += modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, base, this);
+
+                return m_caster->CanReachWithMeleeAttack(target, range_mod) ? SPELL_CAST_OK : SPELL_FAILED_OUT_OF_RANGE;
            }
            break;                                          // let continue in generic way for no target
        }

[Auntie Mangos]

My question is what is the proposed way of fixing this issue? Current topic or you post #14 in this http://getmangos.eu/community/topic/15966/11105patch-melee-attacks-distance/ thread, Schmoozered?

[michalpolko]

Bump, pls review. I would like to implement it on my repo with official code

[Ambal]

In [11141]. Thanks

[goodbadguy]

Seems this effectively broken rogue Sap range. It's supposed to be 60 yards but right now it's more like 5 feet.

[kbz]

60 yard sap?

[goodbadguy]

My bad, 10 yards. Still, now it's only within arms length.

[kbz]

non improved version is melee range with talents this grows, afaik it should work w/o issues (at least my testers havent reported anything bout this)