diff options
author | QAston <none@none> | 2009-06-30 12:59:21 +0200 |
---|---|---|
committer | QAston <none@none> | 2009-06-30 12:59:21 +0200 |
commit | 788a699ae8556b45d1c570253290968224b054fb (patch) | |
tree | 1349ac253ba3be5cd48d95efae5eeadfbcd8641c /src/game/Unit.cpp | |
parent | 97027e0ff3430e19d714e0516870083163dfeca5 (diff) |
*Prevent some possible crashes with charm auras.
*Allow non-dmg spells to proc dmg requiring effects if spellfamily specified in spell_proc_event table.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r-- | src/game/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 227f75a8578..6da5ae063d4 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -7894,7 +7894,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig // try detect target manually if not set if ( target == NULL ) - target = !(procFlags & PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL | PROC_FLAG_SUCCESSFUL_HEALING_SPELL) && IsPositiveSpell(trigger_spell_id) ? this : pVictim; + target = !(procFlags & (PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL | PROC_FLAG_SUCCESSFUL_HEALING_SPELL)) && IsPositiveSpell(trigger_spell_id) ? this : pVictim; // default case if(!target || target!=this && !target->isAlive()) |