Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-28 12:52:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/UnitAI: Removed unneccessary null checks in SpellTargetSelector. CID 1357405 (#17630)

Browse Source
This commit is contained in:
ForesterDev
2016-07-19 13:40:57 +04:00
committed by Aokromes
parent 75ca64a383
commit 64596c6739
1 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/server/game/AI/CoreAI/UnitAI.cpp
View File

@@ -267,10 +267,7 @@ SpellTargetSelector::SpellTargetSelector(Unit* caster, uint32 spellId) :
bool SpellTargetSelector::operator()(Unit const* target) const
{
if (!target)
return false;
if (_spellInfo->CheckTarget(_caster, target) != SPELL_CAST_OK)
if (!target || _spellInfo->CheckTarget(_caster, target) != SPELL_CAST_OK)
return false;
// copypasta from Spell::CheckRange
@@ -282,10 +279,7 @@ bool SpellTargetSelector::operator()(Unit const* target) const
if (_spellInfo->RangeEntry->type & SPELL_RANGE_MELEE)
{
rangeMod = _caster->GetCombatReach() + 4.0f / 3.0f;
if (target)
rangeMod += target->GetCombatReach();
else
rangeMod += _caster->GetCombatReach();
rangeMod += target->GetCombatReach();
rangeMod = std::max(rangeMod, NOMINAL_MELEE_RANGE);
}
@@ -295,10 +289,7 @@ bool SpellTargetSelector::operator()(Unit const* target) const
if (_spellInfo->RangeEntry->type & SPELL_RANGE_RANGED)
{
meleeRange = _caster->GetCombatReach() + 4.0f / 3.0f;
if (target)
meleeRange += target->GetCombatReach();
else
meleeRange += _caster->GetCombatReach();
meleeRange += target->GetCombatReach();
meleeRange = std::max(meleeRange, NOMINAL_MELEE_RANGE);
}
@@ -306,17 +297,14 @@ bool SpellTargetSelector::operator()(Unit const* target) const
minRange = _caster->GetSpellMinRangeForTarget(target, _spellInfo) + meleeRange;
maxRange = _caster->GetSpellMaxRangeForTarget(target, _spellInfo);
if (target)
{
rangeMod = _caster->GetCombatReach();
rangeMod += target->GetCombatReach();
rangeMod = _caster->GetCombatReach();
rangeMod += target->GetCombatReach();
if (minRange > 0.0f && !(_spellInfo->RangeEntry->type & SPELL_RANGE_RANGED))
minRange += rangeMod;
}
if (minRange > 0.0f && !(_spellInfo->RangeEntry->type & SPELL_RANGE_RANGED))
minRange += rangeMod;
}
if (target && _caster->isMoving() && target->isMoving() && !_caster->IsWalking() && !target->IsWalking() &&
if (_caster->isMoving() && target->isMoving() && !_caster->IsWalking() && !target->IsWalking() &&
(_spellInfo->RangeEntry->type & SPELL_RANGE_MELEE || target->GetTypeId() == TYPEID_PLAYER))
rangeMod += 5.0f / 3.0f;
}
@@ -326,7 +314,7 @@ bool SpellTargetSelector::operator()(Unit const* target) const
minRange *= minRange;
maxRange *= maxRange;
if (target && target != _caster)
if (target != _caster)
{
if (_caster->GetExactDistSq(target) > maxRange)
return false;