diff options
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 740f7afdfab..ec83602fa36 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5507,23 +5507,15 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint m_preGeneratedPath = Trinity::make_unique<PathGenerator>(unitCaster); m_preGeneratedPath->SetPathLengthLimit(range); + // first try with raycast, if it fails fall back to normal path - float targetObjectSize = std::min(target->GetCombatReach(), 4.0f); - bool result = m_preGeneratedPath->CalculatePath(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ() + targetObjectSize, false, true); + bool result = m_preGeneratedPath->CalculatePath(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), false, false); if (m_preGeneratedPath->GetPathType() & PATHFIND_SHORT) return SPELL_FAILED_OUT_OF_RANGE; else if (!result || m_preGeneratedPath->GetPathType() & (PATHFIND_NOPATH | PATHFIND_INCOMPLETE)) - { - result = m_preGeneratedPath->CalculatePath(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ() + targetObjectSize, false, false); - if (m_preGeneratedPath->GetPathType() & PATHFIND_SHORT) - return SPELL_FAILED_OUT_OF_RANGE; - else if (!result || m_preGeneratedPath->GetPathType() & (PATHFIND_NOPATH | PATHFIND_INCOMPLETE)) - return SPELL_FAILED_NOPATH; - else if (m_preGeneratedPath->IsInvalidDestinationZ(target)) // Check position z, if not in a straight line - return SPELL_FAILED_NOPATH; - } - else if (m_preGeneratedPath->IsInvalidDestinationZ(target)) // Check position z, if in a straight line - return SPELL_FAILED_NOPATH; + return SPELL_FAILED_NOPATH; + else if (m_preGeneratedPath->IsInvalidDestinationZ(target)) // Check position z, if not in a straight line + return SPELL_FAILED_NOPATH; m_preGeneratedPath->ShortenPathUntilDist(PositionToVector3(target), objSize); // move back } |