josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Partial revert of b0fe236265 , thx A-Metaphysical-Drama for tip

Browse Source 
Closes #2266
Closes #2442
Closes #2454
Closes #2455
Closes #2502
This commit is contained in:
tobmaps
2011-08-06 20:42:00 +07:00
parent d3ab5941b2
commit 7c6366ca11
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Spell.cpp
+16 -2
View File
@@ -5778,12 +5778,26 @@ bool Spell::CanAutoCast(Unit* target)
return false; //target invalid return false; //target invalid
} }
SpellCastResult Spell::CheckRange(bool /*strict*/) SpellCastResult Spell::CheckRange(bool strict)
{ {
// Don't check for instant cast spells
if (!strict && m_casttime == 0)
return SPELL_CAST_OK;
uint32 range_type = 0;
if (m_spellInfo->RangeEntry)
{
// self cast doesn't need range checking -- also for Starshards fix
if (m_spellInfo->RangeEntry->ID == 1)
return SPELL_CAST_OK;
range_type = m_spellInfo->RangeEntry->type;
}
Unit* target = m_targets.GetUnitTarget(); Unit* target = m_targets.GetUnitTarget();
float max_range = m_caster->GetSpellMaxRangeForTarget(target, m_spellInfo); float max_range = m_caster->GetSpellMaxRangeForTarget(target, m_spellInfo);
float min_range = m_caster->GetSpellMinRangeForTarget(target, m_spellInfo); float min_range = m_caster->GetSpellMinRangeForTarget(target, m_spellInfo);
uint32 range_type = m_spellInfo->RangeEntry ? m_spellInfo->RangeEntry->type : 0;
if (Player* modOwner = m_caster->GetSpellModOwner()) if (Player* modOwner = m_caster->GetSpellModOwner())
modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, max_range, this); modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, max_range, this);