[10417] Fix Battle/Guardian elixirs stacking

This commit is contained in:
Laise 2010-08-28 09:31:26 +03:00
parent 821444445b
commit 1f2734f177
2 changed files with 6 additions and 2 deletions

View file

@ -305,7 +305,11 @@ bool IsNoStackAuraDueToAura(uint32 spellId_1, uint32 spellId_2)
if (spellInfo_1->Effect[i] == spellInfo_2->Effect[j] if (spellInfo_1->Effect[i] == spellInfo_2->Effect[j]
&& spellInfo_1->EffectApplyAuraName[i] == spellInfo_2->EffectApplyAuraName[j] && spellInfo_1->EffectApplyAuraName[i] == spellInfo_2->EffectApplyAuraName[j]
&& spellInfo_1->EffectMiscValue[i] == spellInfo_2->EffectMiscValue[j] && spellInfo_1->EffectMiscValue[i] == spellInfo_2->EffectMiscValue[j]
&& spellInfo_1->EffectItemType[i] == spellInfo_2->EffectItemType[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))
return true; return true;
} }
} }

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10416" #define REVISION_NR "10417"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__