aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQAston <qaston@gmail.com>2012-02-16 17:14:02 +0100
committerQAston <qaston@gmail.com>2012-02-16 17:14:32 +0100
commit0d5ae5784c8c8fe702a3faf1277fa4ce03fc2f83 (patch)
tree9b30c1899776a909866b33fc376c11116ac6a1c9 /src
parentba4d1c36f1b947f17ffc394afac11e9fb42d0b9b (diff)
Core/Spells: Make channeled auras stackable by default with other auras.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Spells/Auras/SpellAuras.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index ee5827cdb98..1260425ef55 100755
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -1840,6 +1840,10 @@ bool Aura::CanStackWith(Aura const* existingAura) const
if (!sameCaster)
{
+ // Channeled auras can stack if not forbidden by db or aura type
+ if (existingAura->GetSpellInfo()->IsChanneled())
+ return true;
+
if (m_spellInfo->AttributesEx3 & SPELL_ATTR3_STACK_FOR_DIFF_CASTERS)
return true;