diff options
| author | Machiavelli <none@none> | 2009-06-15 23:59:27 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-06-15 23:59:27 +0200 |
| commit | ef28e35c893f78f6c5a5bd069dc815b33d4ba8c6 (patch) | |
| tree | f4a93967c000a5a84d1668705a7d48011c9a0ef5 /src/game/SpellMgr.cpp | |
| parent | 6ad7da569c51d6c62b707f6c436efb4275daf1b9 (diff) | |
| parent | 9edc94f0922eba48148fec85bf02773c80537978 (diff) | |
*Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellMgr.cpp')
| -rw-r--r-- | src/game/SpellMgr.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 14f7033cfc6..5998933afc1 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -583,6 +583,7 @@ bool IsPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) case 34700: // Allergic Reaction case 31719: // Suspension case 61987: // Avenging Wrath Marker + case 11196: // Recently Bandadged return false; case 12042: // Arcane Power return true; @@ -1275,11 +1276,11 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr { if (EventProcFlag & PROC_FLAG_SUCCESSFUL_DAMAGING_SPELL_HIT) { - if (!(procFlags & PROC_FLAG_SUCCESSFUL_DAMAGING_SPELL_HIT)) + if (!(procExtra & PROC_EX_INTERNAL_DOT)) return false; } else if (EventProcFlag & PROC_FLAG_SUCCESSFUL_HEALING_SPELL - && !(procFlags & PROC_FLAG_SUCCESSFUL_HEALING_SPELL)) + && !(procExtra & PROC_EX_INTERNAL_HOT)) return false; } @@ -1287,11 +1288,11 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr { if (EventProcFlag & PROC_FLAG_TAKEN_DAMAGING_SPELL_HIT) { - if (!(procFlags & PROC_FLAG_TAKEN_DAMAGING_SPELL_HIT)) + if (!(procExtra & PROC_EX_INTERNAL_DOT)) return false; } else if (EventProcFlag & PROC_FLAG_TAKEN_HEALING_SPELL - && !(procFlags & PROC_FLAG_TAKEN_HEALING_SPELL)) + && !(procExtra & PROC_EX_INTERNAL_HOT)) return false; } @@ -3351,10 +3352,8 @@ void SpellMgr::LoadSpellCustomAttr() // Target entry seems to be wrong for this spell :/ spellInfo->EffectImplicitTargetA[0] = TARGET_UNIT_PARTY_CASTER; spellInfo->EffectRadiusIndex[0] = 45; - //mSpellCustomAttr[i] |= SPELL_ATTR_CU_EXCLUDE_SELF; - //break; + break; case 27820: // Mana Detonation - case 55789: // Improved Icy Talons //case 28062: case 39090: // Positive/Negative Charge //case 28085: case 39093: mSpellCustomAttr[i] |= SPELL_ATTR_CU_EXCLUDE_SELF; |