Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Adjust range checks to GameObject targets

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/71b58c2e6215aaf81ced9964ca10983f54fbe14c)
This commit is contained in:
hondacrx
2021-11-29 14:23:32 -05:00
parent eea4bd3fb0
commit 46ef3451c9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Spell.cs
+4 -4
View File
@@ -5736,6 +5736,9 @@ namespace Game.Spells
if (m_spellInfo.RangeEntry != null && m_spellInfo.RangeEntry.Flags != SpellRangeFlag.Melee && !strict) if (m_spellInfo.RangeEntry != null && m_spellInfo.RangeEntry.Flags != SpellRangeFlag.Melee && !strict)
maxRange += Math.Min(3.0f, maxRange * 0.1f); // 10% but no more than 3.0f maxRange += Math.Min(3.0f, maxRange * 0.1f); // 10% but no more than 3.0f
// save the original values before squaring them
float origMaxRange = maxRange;
// get square values for sqr distance checks // get square values for sqr distance checks
minRange *= minRange; minRange *= minRange;
maxRange *= maxRange; maxRange *= maxRange;
@@ -5758,10 +5761,7 @@ namespace Game.Spells
GameObject goTarget = m_targets.GetGOTarget(); GameObject goTarget = m_targets.GetGOTarget();
if (goTarget != null) if (goTarget != null)
{ {
if (m_caster.GetExactDistSq(goTarget) > maxRange) if (!goTarget.IsInRange(m_caster.GetPositionX(), m_caster.GetPositionY(), m_caster.GetPositionZ(), origMaxRange))
return SpellCastResult.OutOfRange;
if (minRange > 0.0f && m_caster.GetExactDistSq(goTarget) < minRange)
return SpellCastResult.OutOfRange; return SpellCastResult.OutOfRange;
} }