diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index d4243ab5b..2e374fb9c 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -300,9 +300,9 @@ bool IsNoStackAuraDueToAura(uint32 spellId_1, uint32 spellId_2) for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i) { - for (int32 j = 0; i < MAX_EFFECT_INDEX; ++j) + for (int32 j = 0; j < MAX_EFFECT_INDEX; ++j) { - 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->EffectMiscValue[i] == spellInfo_2->EffectMiscValue[j] && spellInfo_1->EffectItemType[i] == spellInfo_2->EffectItemType[j]) @@ -2266,7 +2266,7 @@ SpellEntry const* SpellMgr::SelectAuraRankForLevel(SpellEntry const* spellInfo, for(int i = 0; i < MAX_EFFECT_INDEX; ++i) { // for simple aura in check apply to any non caster based targets, in rank search mode to any explicit targets - if (((spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA && + if (((spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA && (IsExplicitPositiveTarget(spellInfo->EffectImplicitTargetA[i]) || IsAreaEffectPossitiveTarget(Targets(spellInfo->EffectImplicitTargetA[i])))) || spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AREA_AURA_PARTY || @@ -4022,4 +4022,4 @@ SpellEntry const* GetSpellEntryByDifficulty(uint32 id, Difficulty difficulty) SpellEntry const* spellEntry = sSpellStore.LookupEntry(spellDiff->spellId[difficulty]); return spellEntry; -} \ No newline at end of file +} diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 2d72810a1..fd55f0697 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 "10233" + #define REVISION_NR "10234" #endif // __REVISION_NR_H__