aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/SpellMgr.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2010-12-05 20:43:09 +0100
committerQAston <none@none>2010-12-05 20:43:09 +0100
commit7db1b39224c14eafde1f0d5a9426e76e4f034233 (patch)
tree5c497947f50ccdfe4936cd41b012af5d6ac3a934 /src/server/game/Spells/SpellMgr.cpp
parent6fe19b5a863dd1109700c8a28dad22a8c3b7526c (diff)
Core/Auras: backout r2bf34fd7ac and add alternative - not spell specific sollution for the problem.
--HG-- branch : trunk
Diffstat (limited to 'src/server/game/Spells/SpellMgr.cpp')
-rwxr-xr-xsrc/server/game/Spells/SpellMgr.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 09a96ebf9a8..8a3074742f0 100755
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -3157,6 +3157,9 @@ bool SpellMgr::CanAurasStack(SpellEntry const *spellInfo_1, SpellEntry const *sp
case SPELL_AURA_OBS_MOD_POWER:
case SPELL_AURA_OBS_MOD_HEALTH:
case SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE:
+ // periodic auras which target areas are not allowed to stack this way (replenishment for example)
+ if (IsAreaOfEffectSpellEffect(spellInfo_1, i) || IsAreaOfEffectSpellEffect(spellInfo_2, i))
+ break;
return true;
default:
break;