Core/Spells: Adjust range checks to GameObject targets

1 files changed, 4 insertions, 4 deletions

diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 415b6d12f09..57f6ecac698 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -6287,6 +6287,9 @@ SpellCastResult Spell::CheckRange(bool strict) const
     if (m_spellInfo->RangeEntry && m_spellInfo->RangeEntry->type != SPELL_RANGE_MELEE && !strict)
         maxRange += std::min(MAX_SPELL_RANGE_TOLERANCE, maxRange*0.1f); // 10% but no more than MAX_SPELL_RANGE_TOLERANCE
 
+    // save the original values before squaring them
+    float origMaxRange = maxRange;
+
     // get square values for sqr distance checks
     minRange *= minRange;
     maxRange *= maxRange;
@@ -6307,10 +6310,7 @@ SpellCastResult Spell::CheckRange(bool strict) const
 
     if (GameObject* goTarget = m_targets.GetGOTarget())
     {
-        if (m_caster->GetExactDistSq(goTarget) > maxRange)
-            return SPELL_FAILED_OUT_OF_RANGE;
-
-        if (minRange > 0.0f && m_caster->GetExactDistSq(goTarget) < minRange)
+        if (!goTarget->IsInRange(m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ(), origMaxRange))
             return SPELL_FAILED_OUT_OF_RANGE;
     }