Created
August 5, 2011 20:01
-
-
Save tobmaps/1128372 to your computer and use it in GitHub Desktop.
small revert
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp | |
index c0b0460..ba7b969 100755 | |
--- a/src/server/game/Spells/Spell.cpp | |
+++ b/src/server/game/Spells/Spell.cpp | |
@@ -5778,12 +5778,26 @@ bool Spell::CanAutoCast(Unit* target) | |
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(); | |
float max_range = m_caster->GetSpellMaxRangeForTarget(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()) | |
modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, max_range, this); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment