diff options
| author | QAston <none@none> | 2009-03-19 10:40:02 +0100 |
|---|---|---|
| committer | QAston <none@none> | 2009-03-19 10:40:02 +0100 |
| commit | 3ff11b64bae87a8c33aede71816ed7fb8b82f766 (patch) | |
| tree | 8bb37edb3773bb936bc6e1e35c45f61cc183d6af /src/game/SpellMgr.cpp | |
| parent | c4a5368d4e81570a3ac20d151f671c79c92b1557 (diff) | |
*Move Overkill and Master of Subtlety to procflag and fix some issues with them.
*Proc Shattered Barrier only on aura destroy.
*Fix some possible issues with aura stackamount display.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellMgr.cpp')
| -rw-r--r-- | src/game/SpellMgr.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 07c411160f3..08bcdbb1152 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1408,9 +1408,15 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool spellInfo_1=sSpellStore.LookupEntry(GetLastSpellInChain(spellId_1)); spellInfo_2=sSpellStore.LookupEntry(GetLastSpellInChain(spellId_2)); + if (spellInfo_1==spellInfo_2) + return true; + //if spells have exactly the same effect they cannot stack for(uint32 i = 0; i < 3; ++i) if(spellInfo_1->Effect[i] != spellInfo_2->Effect[i] + // Allow dummy auras stack (needed by 31666 and 58428) + || spellInfo_1->EffectApplyAuraName[i] == SPELL_AURA_DUMMY + || spellInfo_1->EffectApplyAuraName[i] == SPELL_AURA_PERIODIC_DUMMY || spellInfo_1->EffectApplyAuraName[i] != spellInfo_2->EffectApplyAuraName[i] || spellInfo_1->EffectMiscValue[i] != spellInfo_2->EffectMiscValue[i]) // paladin resist aura return false; // need itemtype check? need an example to add that check |