diff options
| author | megamage <none@none> | 2009-03-09 18:17:04 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-09 18:17:04 -0600 |
| commit | aeefdeb8db194e4216ba82d15af2477c9ff40503 (patch) | |
| tree | 514339d3ea6a3adf959f86a80c5957c3cb8d68d3 /src/game/SpellMgr.cpp | |
| parent | cd5088845d4d713fdfd10c035012b2d15e039a49 (diff) | |
| parent | 7cc3dfa8d54500a85e1887f721dca79940078378 (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; |