diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-02-09 18:53:55 +0100 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2017-02-10 02:04:38 -0300 |
| commit | 090546a80a0b0d29d619c1b0f38da1375dcd37d0 (patch) | |
| tree | 8c83d11b38834e57dc9ac0853a3a7fd94be34dbf /src | |
| parent | 43c6fa078b91cc0e08e4092a7d2eb2cafb448f32 (diff) | |
Core/Auras: Allow passive auras from items to stack
(cherry picked from commit 8453d7dae25823dd5d2ecf2b718a469c0553214c)
Diffstat (limited to 'src')
| -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 f8cefe0b7c1..6d334b2310d 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1729,7 +1729,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 (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) |