aboutsummaryrefslogtreecommitdiff
path: root/src/game/Spell.cpp
diff options
context:
space:
mode:
authorXTZGZoReX <none@none>2009-03-20 20:46:52 +0100
committerXTZGZoReX <none@none>2009-03-20 20:46:52 +0100
commiteddb72d1eaa21dfff850f7af56c3c59e0442d577 (patch)
tree0f26377096336dd6f056db9f0716961fde69490f /src/game/Spell.cpp
parent2bfa6254cc877043914ebd7a3a3c32e1ab66e187 (diff)
parentad06f05ddbbe1ddd9cde94abf7f47f0e7c17dc13 (diff)
* Merge.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
-rw-r--r--src/game/Spell.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 881a68e6c19..6784fc2f2a5 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2252,9 +2252,9 @@ void Spell::cast(bool skipCheck)
if(m_spellInfo->SpellFamilyName)
{
- if (m_spellInfo->excludeCasterAuraSpell)
+ if (m_spellInfo->excludeCasterAuraSpell && !IsPositiveSpell(m_spellInfo->excludeCasterAuraSpell))
m_preCastSpell = m_spellInfo->excludeCasterAuraSpell;
- else if (m_spellInfo->excludeTargetAuraSpell)
+ else if (m_spellInfo->excludeTargetAuraSpell && !IsPositiveSpell(m_spellInfo->excludeTargetAuraSpell))
m_preCastSpell = m_spellInfo->excludeTargetAuraSpell;
}
switch (m_spellInfo->SpellFamilyName)