diff options
| author | QAston <none@none> | 2009-04-25 20:36:31 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-04-25 20:36:31 +0200 |
| commit | ec4031be35cca5b1ce180c399716d40eff3825ca (patch) | |
| tree | c65979c7ca264f7a4518479bf883249130963e96 /src | |
| parent | 373914f1f96c7249df6bb9ced1ba27be44dfa676 (diff) | |
*Fix improved shadowform.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellMgr.cpp | 7 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 15d6279bcd0..233ef09f4f5 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1220,11 +1220,10 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr else // For spells need check school/spell family/family mask { // Item cast can trigger only with spells with spellfamily - if (procExtra & PROC_EX_INTERNAL_ITEM_CAST && procSpell->SpellFamilyName) + if (procExtra & PROC_EX_INTERNAL_ITEM_CAST) { - if (procSpell->SpellFamilyName == spellProcEvent->spellFamilyName) - return true; - return false; + if (!spellProcEvent->SpellFamilyName) + return false; } // Check (if set) for school if(spellProcEvent->schoolMask && (spellProcEvent->schoolMask & procSpell->SchoolMask) == 0) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 1ebbd606c2f..c0cc4266763 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5512,6 +5512,14 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger triggered_spell_id = 56160; break; } + // Improved Shadowform + case 47570: + case 47569: + { + RemoveAurasByTypeWithDispel(SPELL_AURA_MOD_ROOT); + RemoveAurasByTypeWithDispel(SPELL_AURA_MOD_DECREASE_SPEED); + break; + } // Psychic Horror case 47571: { |