diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-21 21:57:09 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-21 21:58:30 +0100 |
| commit | 3f99890b129c836cd364169ec4d69620bff0ca82 (patch) | |
| tree | c71f17ba9f1425ec1044b6dfec60c4e8aa2902a8 /src/server/game/Spells/SpellMgr.cpp | |
| parent | 7c4a16e6c2f9cd6faa4d66ade9fa017267310632 (diff) | |
| parent | 101ac7f5110030ac12fa13f3e9a9d2c671e48734 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
Diffstat (limited to 'src/server/game/Spells/SpellMgr.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index daa6c1f7c93..bac84951e21 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -817,7 +817,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr { if (EventProcFlag & PROC_FLAG_TAKEN_SPELL_MAGIC_DMG_CLASS_POS) { - if (!(procExtra & PROC_EX_INTERNAL_DOT)) + if (!(procExtra & PROC_EX_INTERNAL_HOT)) return false; } else if (procExtra & PROC_EX_INTERNAL_HOT) |