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

Core/Object: Range check, Needs tested.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/b717603a9b3a676e800fc401f4544735287791a9)
This commit is contained in:
hondacrx
2021-12-01 22:57:42 -05:00
parent 112970fb72
commit b4febb11c8
7 changed files with 291 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Spell.cs
+1 -8
View File
@@ -5736,10 +5736,6 @@ namespace Game.Spells
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
// save the original values before squaring them
float origMinRange = minRange;
float origMaxRange = maxRange;
// get square values for sqr distance checks
minRange *= minRange;
maxRange *= maxRange;
@@ -5762,10 +5758,7 @@ namespace Game.Spells
GameObject goTarget = m_targets.GetGOTarget();
if (goTarget != null)
{
if (origMinRange > 0.0f && goTarget.IsInRange(m_caster.GetPositionX(), m_caster.GetPositionY(), m_caster.GetPositionZ(), origMinRange))
return SpellCastResult.OutOfRange;
if (!goTarget.IsInRange(m_caster.GetPositionX(), m_caster.GetPositionY(), m_caster.GetPositionZ(), origMaxRange))
if (!goTarget.IsAtInteractDistance(m_caster.ToPlayer(), m_spellInfo))
return SpellCastResult.OutOfRange;
}