diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 8a191b41a..0d0ba4a97 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -307,9 +307,7 @@ bool IsNoStackAuraDueToAura(uint32 spellId_1, uint32 spellId_2) && spellInfo_1->EffectMiscValue[i] == spellInfo_2->EffectMiscValue[j] && spellInfo_1->EffectItemType[i] == spellInfo_2->EffectItemType[j] && (spellInfo_1->Effect[i] != 0 || spellInfo_1->EffectApplyAuraName[i] != 0 || - spellInfo_1->EffectMiscValue[i] != 0 || spellInfo_1->EffectItemType[i] != 0) - && (spellInfo_1->Effect[j] != 0 || spellInfo_1->EffectApplyAuraName[j] != 0 || - spellInfo_1->EffectMiscValue[j] != 0 || spellInfo_1->EffectItemType[j] != 0)) + spellInfo_1->EffectMiscValue[i] != 0 || spellInfo_1->EffectItemType[i] != 0)) return true; } } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 0b21a4ff6..28b46986f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10425" + #define REVISION_NR "10426" #endif // __REVISION_NR_H__