aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQAston <none@none>2009-07-22 19:16:40 +0200
committerQAston <none@none>2009-07-22 19:16:40 +0200
commitf9975c95360869f4a284b97b80220f360b3a6dd5 (patch)
tree80a2a019bf8260ee5665b18406cb03235664ef5e
parent70e6446118843099bd5739eb17839d63f9a43cd9 (diff)
*Allow SPELL_AURA_TRANSFORM to to be breakble by damage using proc system.
--HG-- branch : trunk
-rw-r--r--src/game/SpellAuras.cpp3
-rw-r--r--src/game/Unit.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 6be082b4f6f..59bbffdf261 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -7532,7 +7532,8 @@ int32 AuraEffect::CalculateCrowdControlAuraAmount(Unit * caster)
if (m_auraName !=SPELL_AURA_MOD_CONFUSE &&
m_auraName !=SPELL_AURA_MOD_FEAR &&
m_auraName !=SPELL_AURA_MOD_STUN &&
- m_auraName !=SPELL_AURA_MOD_ROOT)
+ m_auraName !=SPELL_AURA_MOD_ROOT &&
+ m_auraName !=SPELL_AURA_TRANSFORM)
return 0;
int32 damageCap = (int32)(m_target->GetMaxHealth()*0.10f);
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 18a5beb11c8..adb323be2b6 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -12843,6 +12843,7 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
case SPELL_AURA_MOD_FEAR:
case SPELL_AURA_MOD_STUN:
case SPELL_AURA_MOD_ROOT:
+ case SPELL_AURA_TRANSFORM:
if (isVictim && damage)
{
// Damage is dealt after proc system - lets ignore auras which wasn't updated yet