josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Fix passive auras stacking logic after recent changes.

Browse Source 
Closes #2417
This commit is contained in:
QAston
2011-07-28 03:08:42 +02:00
parent 7094f57841
commit f33a0c23ca
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Auras/SpellAuras.cpp
+2 -2
View File
@@ -1771,8 +1771,8 @@ bool Aura::CanStackWith(Aura const* existingAura) const
SpellInfo const* existingSpellInfo = existingAura->GetSpellInfo(); SpellInfo const* existingSpellInfo = existingAura->GetSpellInfo();
bool sameCaster = GetCasterGUID() == existingAura->GetCasterGUID(); bool sameCaster = GetCasterGUID() == existingAura->GetCasterGUID();
// passive auras don't stack when cast by different casters, or with another rank of the spell // passive auras don't stack with another rank of the spell cast by same caster
if (IsPassive() && (!sameCaster || !m_spellInfo->IsDifferentRankOf(existingSpellInfo))) if (IsPassive() && sameCaster && m_spellInfo->IsDifferentRankOf(existingSpellInfo))
return false; return false;
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
src/server/game/Spells/SpellInfo.cpp
+1 -1
View File
@@ -803,7 +803,7 @@ bool SpellInfo::CanBeUsedInCombat() const
bool SpellInfo::IsPositive() const bool SpellInfo::IsPositive() const
{ {
return AttributesCu & SPELL_ATTR0_CU_NEGATIVE; return !(AttributesCu & SPELL_ATTR0_CU_NEGATIVE);
} }
bool SpellInfo::IsPositiveEffect(uint8 effIndex) const bool SpellInfo::IsPositiveEffect(uint8 effIndex) const