diff options
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
-rw-r--r-- | src/server/game/Spells/Spell.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index ad802f400d4..2fe22b2cc7e 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -7407,6 +7407,13 @@ SpellCastResult Spell::CheckRange(bool strict) const return SPELL_CAST_OK; } +bool Spell::CanIncreaseRangeByMovement(Unit const* unit) +{ + // forward running only + return unit->HasUnitMovementFlag(MOVEMENTFLAG_FORWARD | MOVEMENTFLAG_STRAFE_LEFT | MOVEMENTFLAG_STRAFE_RIGHT | MOVEMENTFLAG_FALLING) + && !unit->IsWalking(); +} + std::pair<float, float> Spell::GetMinMaxRange(bool strict) const { float rangeMod = 0.0f; @@ -7448,7 +7455,7 @@ std::pair<float, float> Spell::GetMinMaxRange(bool strict) const } } - if (target && unitCaster && unitCaster->isMoving() && target->isMoving() && !unitCaster->IsWalking() && !target->IsWalking() && + if (target && unitCaster && CanIncreaseRangeByMovement(target) && CanIncreaseRangeByMovement(unitCaster) && ((m_spellInfo->RangeEntry->Flags & SPELL_RANGE_MELEE) || target->GetTypeId() == TYPEID_PLAYER)) rangeMod += 8.0f / 3.0f; } |