diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2016-11-03 22:42:34 -0300 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2016-11-03 22:42:34 -0300 |
| commit | 7a79443281affae03ddbc5367c73c90b8284b23d (patch) | |
| tree | 37e3b58fa35eb330b8d5513772bbd25890b238f2 /src | |
| parent | 256f6011a6221c6560952fc258e3927f619bd181 (diff) | |
Core/SpellMgr: static analysis checks
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index a335f17b338..b04fe60edb9 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -544,11 +544,8 @@ bool SpellMgr::CanSpellTriggerProcOnEvent(SpellProcEntry const& procEntry, ProcE if (procEntry.SpellFamilyMask && eventSpellInfo && !(procEntry.SpellFamilyMask & eventSpellInfo->SpellFamilyFlags)) return false; - } - // check spell type mask (if set) - if (eventInfo.GetTypeMask() & (SPELL_PROC_FLAG_MASK | PERIODIC_PROC_FLAG_MASK)) - { + // check spell type mask (if set) if (procEntry.SpellTypeMask && !(eventInfo.GetSpellTypeMask() & procEntry.SpellTypeMask)) return false; } @@ -2641,7 +2638,8 @@ void SpellMgr::LoadSpellInfoCorrections() case 51532: // Maelstrom Weapon (Rank 5) // due to discrepancies between ranks spellInfo->EquippedItemSubClassMask = 0x0000FC33; - // no break intended (only Rank 5 has SPELL_ATTR3_CAN_PROC_WITH_TRIGGERED) + spellInfo->AttributesEx3 |= SPELL_ATTR3_CAN_PROC_WITH_TRIGGERED; + break; case 20335: // Heart of the Crusader case 20336: case 20337: |