diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-02-09 18:53:55 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-02-09 18:53:55 +0100 |
| commit | 8453d7dae25823dd5d2ecf2b718a469c0553214c (patch) | |
| tree | c15685973e4c68e54407678c0e6c26f5139ff728 | |
| parent | 8aacc07727835ad3f81bebde3308cfdc4de2f26e (diff) | |
Core/Auras: Allow passive auras from items to stack
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuras.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 9c6c4e8779a..403dce62f71 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1613,7 +1613,7 @@ bool Aura::CanStackWith(Aura const* existingAura) const bool sameCaster = GetCasterGUID() == existingAura->GetCasterGUID(); // passive auras don't stack with another rank of the spell cast by same caster - if (IsPassive() && sameCaster && m_spellInfo->IsRankOf(existingSpellInfo)) + if (IsPassive() && sameCaster && (m_spellInfo->IsDifferentRankOf(existingSpellInfo) || (m_spellInfo->Id == existingSpellInfo->Id && m_castItemGuid.IsEmpty()))) return false; for (SpellEffectInfo const* effect : existingAura->GetSpellEffectInfos()) |