Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Auras: Allow passive auras from items to stack

Browse Source 
(cherry picked from commit 8453d7dae2)
This commit is contained in:
Shauren
2017-02-09 18:53:55 +01:00
committed by roc13x
parent 557f714a10
commit bba87cfeee
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Spells/Auras/SpellAuras.cpp
View File

@@ -1566,7 +1566,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)