From 31722c1c0cc6fd9fbdef57dee66bd5f47c76b137 Mon Sep 17 00:00:00 2001 From: DiSlord Date: Wed, 14 Jan 2009 21:49:11 +0300 Subject: [PATCH] [7085] Restore work 12975 after client switch, patch by MaS0n Signed-off-by: DiSlord --- src/game/SpellEffects.cpp | 26 +++++++++++++++----------- src/shared/revision_nr.h | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 505531750..fc5c8c809 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -721,12 +721,6 @@ void Spell::EffectDummy(uint32 i) m_caster->CastCustomSpell(unitTarget, 12721, &deepWoundsDotBasePoints0, NULL, NULL, true, NULL); return; } - case 12975: //Last Stand - { - int32 healthModSpellBasePoints0 = int32(m_caster->GetMaxHealth()*0.3); - m_caster->CastCustomSpell(m_caster, 12976, &healthModSpellBasePoints0, NULL, NULL, true, NULL); - return; - } case 13120: // net-o-matic { if(!unitTarget) @@ -1276,13 +1270,23 @@ void Spell::EffectDummy(uint32 i) m_caster->SetPower(POWER_RAGE,0); return; } - if(m_spellInfo->Id==21977) //Warrior's Wrath + switch(m_spellInfo->Id) { - if(!unitTarget) + // Warrior's Wrath + case 21977: + { + if(!unitTarget) + return; + m_caster->CastSpell(unitTarget,21887,true); // spell mod return; - - m_caster->CastSpell(unitTarget,21887,true); // spell mod - return; + } + // Last Stand + case 12975: + { + int32 healthModSpellBasePoints0 = int32(m_caster->GetMaxHealth()*0.3); + m_caster->CastCustomSpell(m_caster, 12976, &healthModSpellBasePoints0, NULL, NULL, true, NULL); + return; + } } break; case SPELLFAMILY_WARLOCK: diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 875aa6b15..c1233bb64 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 "7084" + #define REVISION_NR "7085" #endif // __REVISION_NR_H__