ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

fix(Core/Spells): Fix ranged spell minimum range incorrectly applying leeway (#25230)

Browse source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
Co-authored-by: Chaouki Dhib <chaodhib@gmail.com>
Co-authored-by: sogladev <sogladev@gmail.com>
This commit is contained in:
blinkysc 2026-03-26 19:29:44 -05:00 • committed by GitHub
parent 6cb375e015
commit 44dfaf8075
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/server/game/Spells/Spell.cpp
View file

@ -7079,18 +7079,18 @@ SpellCastResult Spell::CheckRange(bool strict)
else if (!m_caster->IsWithinCombatRange(target, max_range))
return SPELL_FAILED_OUT_OF_RANGE; //0x5A;
if (m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_RANGED && range_type == SPELL_RANGE_RANGED)
{
if (m_caster->IsWithinMeleeRange(target))
return SPELL_FAILED_TOO_CLOSE;
}
if (m_caster->IsPlayer() && (m_spellInfo->FacingCasterFlags & SPELL_FACING_FLAG_INFRONT) && !m_caster->HasInArc(static_cast<float>(M_PI), target) && !m_caster->IsWithinBoundaryRadius(target))
return SPELL_FAILED_UNIT_NOT_INFRONT;
}
// Xinef: check min range for self casts
if (min_range && range_type != SPELL_RANGE_RANGED && m_caster->IsWithinCombatRange(target, min_range)) // skip this check if min_range = 0
// Check min range - for ranged spells, min range is the spell's min range + melee range (no leeway)
if (range_type == SPELL_RANGE_RANGED)
{
float minRangeCombined = min_range + m_caster->GetMeleeRange(target);
if (m_caster->IsWithinRange(target, minRangeCombined))
return SPELL_FAILED_TOO_CLOSE;
}
else if (min_range > 0 && m_caster->IsWithinCombatRange(target, min_range))
return SPELL_FAILED_TOO_CLOSE;
}