From 2846ea21f175988a5a665ff4ac7d0890d51bbf58 Mon Sep 17 00:00:00 2001 From: pasdVn Date: Fri, 7 May 2010 16:37:52 +0300 Subject: [PATCH] [9845] Fix dispel damage for 30108 and ranks Signed-off-by: Laise --- src/game/Unit.cpp | 4 +++- src/shared/revision_nr.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index f5ea1b8f0..98a55c2b2 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4175,7 +4175,9 @@ void Unit::RemoveSingleAuraDueToSpellByDispel(uint32 spellId, uint64 casterGUID, { if (Aura* dotAura = GetAura(SPELL_AURA_PERIODIC_DAMAGE,SPELLFAMILY_WARLOCK,UI64LIT(0x010000000000),0x00000000,casterGUID)) { - int32 damage = dotAura->GetModifier()->m_amount*9; + // use clean value for initial damage + int32 damage = dotAura->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_0); + damage *= 9; // Remove spell auras from stack RemoveSingleSpellAurasByCasterSpell(spellId, casterGUID, AURA_REMOVE_BY_DISPEL); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 667705874..6885ea1bf 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9844" + #define REVISION_NR "9845" #endif // __REVISION_NR_H__