aboutsummaryrefslogtreecommitdiff
path: root/src/game/Unit.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-05-26 16:00:19 -0500
committermegamage <none@none>2009-05-26 16:00:19 -0500
commit38f4a60bebf840cc4000e1c16d1f7f35ac2beb12 (patch)
tree01d4a46ad51b87ca50b0ab9a337cfe9d535f8ae3 /src/game/Unit.cpp
parentce8b7a68398bab602d8a8f71c7c3dbab5af137ea (diff)
*Correct some aura interrupt flags
--HG-- branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r--src/game/Unit.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 608932b531a..e2db82879a4 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -579,7 +579,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
if (damagetype != NODAMAGE)
{
// interrupting auras with AURA_INTERRUPT_FLAG_DAMAGE before checking !damage (absorbed damage breaks that type of auras)
- pVictim->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_DAMAGE, spellProto ? spellProto->Id : 0);
+ pVictim->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TAKE_DAMAGE, spellProto ? spellProto->Id : 0);
pVictim->RemoveSpellbyDamageTaken(damage, spellProto ? spellProto->Id : 0);
}
@@ -2359,7 +2359,7 @@ void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool ex
return;
CombatStart(pVictim);
- RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ATTACK);
+ RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MELEE_ATTACK);
uint32 hitInfo;
if (attType == BASE_ATTACK)