diff options
| author | QAston <none@none> | 2009-03-10 00:54:42 +0100 |
|---|---|---|
| committer | QAston <none@none> | 2009-03-10 00:54:42 +0100 |
| commit | 7cc3dfa8d54500a85e1887f721dca79940078378 (patch) | |
| tree | cbaedc0576ae0353908eefd83f7a9f0360714546 /src/game/SpellMgr.cpp | |
| parent | 19717bbaa61ca43ee4ea081d95ca61b620f428d8 (diff) | |
| parent | 19af8f62adcf9b76a419ed49fee169733bbfcedf (diff) | |
*Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellMgr.cpp')
| -rw-r--r-- | src/game/SpellMgr.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index c6365294c5f..7ea0b7cec26 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1353,6 +1353,9 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool case SPELL_AURA_PERIODIC_ENERGIZE: case SPELL_AURA_PERIODIC_MANA_LEECH: case SPELL_AURA_PERIODIC_LEECH: + case SPELL_AURA_POWER_BURN_MANA: + case SPELL_AURA_OBS_MOD_ENERGY: + case SPELL_AURA_OBS_MOD_HEALTH: return false; default: break; |