From 090546a80a0b0d29d619c1b0f38da1375dcd37d0 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 9 Feb 2017 18:53:55 +0100 Subject: Core/Auras: Allow passive auras from items to stack (cherry picked from commit 8453d7dae25823dd5d2ecf2b718a469c0553214c) --- src/server/game/Spells/Auras/SpellAuras.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server') 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) -- cgit v1.2.3