Core/Object: Range check (#23179) (ported commit: 32e1de39a26628dcb64bc21ad415afb2ad938925)

This commit is contained in:
Ovahlord committed 2019-04-26 18:41:31 +02:00
1 parent 738aa92782
commit e5d59d5f98
6 files changed
+169 -36

No files matched your search

+1 -7
View File
@@ -6439,9 +6439,6 @@ 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 origMinRange = minRange, origMaxRange = maxRange;
// get square values for sqr distance checks
minRange *= minRange;
maxRange *= maxRange;
@@ -6463,10 +6460,7 @@ SpellCastResult Spell::CheckRange(bool strict) const
if (GameObject* goTarget = m_targets.GetGOTarget())
{
if (origMinRange > 0.0f && goTarget->IsInRange(m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ(), origMinRange))
return SPELL_FAILED_OUT_OF_RANGE;
if (!goTarget->IsInRange(m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ(), origMaxRange))
if (!goTarget->IsAtInteractDistance(m_caster->ToPlayer(), m_spellInfo))
return SPELL_FAILED_OUT_OF_RANGE;
}