From 407156cbaff9a0d612efd15c71777485b9d2f198 Mon Sep 17 00:00:00 2001 From: Laise Date: Sun, 20 Jun 2010 22:28:51 +0300 Subject: [PATCH] [10088] Restore work of 1120 and ranks. (Revert of [9962]) --- src/game/SpellAuras.cpp | 10 ---------- src/game/Unit.cpp | 8 ++++++++ src/shared/revision_nr.h | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 533c09805..263e473b3 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -4959,16 +4959,6 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real) } break; } - case SPELLFAMILY_WARLOCK: - { - // Drain Soul - if (spellProto->SpellFamilyFlags & UI64LIT(0x0000000000004000)) - { - if (target->GetHealth() * 100 / target->GetMaxHealth() <= 25) - m_modifier.m_amount *= 4; - } - break; - } case SPELLFAMILY_DRUID: { // Rake diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 81f6db4d0..a280dd8d6 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9177,7 +9177,15 @@ uint32 Unit::SpellDamageBonusDone(Unit *pVictim, SpellEntry const *spellProto, u break; } case SPELLFAMILY_WARLOCK: + { + // Drain Soul + if (spellProto->SpellFamilyFlags & UI64LIT(0x0000000000004000)) + { + if (pVictim->GetHealth() * 100 / pVictim->GetMaxHealth() <= 25) + DoneTotalMod *= 4; + } break; + } case SPELLFAMILY_PRIEST: { // Glyph of Smite diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 6f0d599ff..c3210f870 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 "10087" + #define REVISION_NR "10088" #endif // __REVISION_NR_H__