diff options
author | megamage <none@none> | 2009-04-11 12:01:27 -0500 |
---|---|---|
committer | megamage <none@none> | 2009-04-11 12:01:27 -0500 |
commit | f4d69d1b3b8fe6d26195b14f0ec2133b872c735c (patch) | |
tree | 5db77ed528332523d3db4071810ea4d09aa177ae /src/game/Spell.cpp | |
parent | c9005f636eb41a7f88400c6925eb2c5d47bf4c9f (diff) | |
parent | 2e0ffba0bcea53f8b5ce15a51174c34cbc55d202 (diff) |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
-rw-r--r-- | src/game/Spell.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 7c40049fd32..691aa35d774 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -4641,8 +4641,9 @@ bool Spell::CanAutoCast(Unit* target) } else { - if( (target->GetAuraEffect(m_spellInfo->Id, j))->GetParentAura()->GetStackAmount() >= m_spellInfo->StackAmount) - return false; + if( AuraEffect * aureff = target->GetAuraEffect(m_spellInfo->Id, j)) + if (aureff->GetParentAura()->GetStackAmount() >= m_spellInfo->StackAmount) + return false; } } else if ( IsAreaAuraEffect( m_spellInfo->Effect[j] )) |