diff options
| author | megamage <none@none> | 2008-11-28 13:10:16 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2008-11-28 13:10:16 -0600 |
| commit | 93ba82e8ca62809ba048218ff8bca2f36d069962 (patch) | |
| tree | 39cb5ea3b2b9db0b6010f2c6ca9ec67d82bccfbc /src/game/Unit.cpp | |
| parent | fb2c984b03ebe0b0595071a689d79f5d7b4dab9e (diff) | |
| parent | b37d7ae04232fc9279e505926468c91f9e26a991 (diff) | |
*Merge with 342.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 36f9fcecf48..f23f450c201 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -881,8 +881,9 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa if(damagetype == DIRECT_DAMAGE || damagetype == SPELL_DIRECT_DAMAGE) { //TODO: This is from procflag, I do not know which spell needs this + //Maim? //if (!spellProto || !(spellProto->AuraInterruptFlags&AURA_INTERRUPT_FLAG_DIRECT_DAMAGE)) - pVictim->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_DIRECT_DAMAGE); + pVictim->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_DIRECT_DAMAGE, spellProto ? spellProto->Id : 0); } if (pVictim->GetTypeId() != TYPEID_PLAYER) |