Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Break spells on damage in some aura types.

Browse Source 
This commit fixes spell Repentance(20066).

Patch by QAston, thanks to him.

--HG--
branch : trunk
This commit is contained in:
Anubisss
2010-03-30 15:49:59 +02:00
parent 66f5d749c0
commit b66f312888
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/game/Unit.cpp
View File

@@ -13734,19 +13734,20 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit * pTarget, uint32 procFlag,
case SPELL_AURA_MOD_STUN:
case SPELL_AURA_MOD_ROOT:
case SPELL_AURA_TRANSFORM:
if (isVictim && damage)
{
// chargeable mods are breaking on hit
if (useCharges)
takeCharges = true;
else
{
// Damage is dealt after proc system - lets ignore auras which wasn't updated yet
// to make spell not remove its own aura
if (i->aura->GetDuration() == i->aura->GetMaxDuration())
break;
int32 damageLeft = triggeredByAura->GetAmount();
// No damage left
if (damageLeft < damage )
if (damageLeft < damage)
i->aura->Remove();
else
triggeredByAura->SetAmount(damageLeft-damage);
triggeredByAura->SetAmount(damageLeft - damage);
}
}
break;
//case SPELL_AURA_ADD_FLAT_MODIFIER:
//case SPELL_AURA_ADD_PCT_MODIFIER: