[10426] Remove not needed checks from IsNoStackAuraDueToAura

Signed-off-by: Laise <fenrisse@gmail.com>
mangos · Aug 30, 2010 · a1b97ce · a1b97ce
1 parent b181a7d
commit a1b97ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10425"
+ #define REVISION_NR "10426"
 #endif // __REVISION_NR_H__