From 065bcc6b5c2e98d88bf1923b40691ad7ed34836a Mon Sep 17 00:00:00 2001 From: Schmoozerd Date: Thu, 5 Jul 2012 21:13:50 +0200 Subject: [PATCH] Revert "[12028] Implement spell 70842" Reason: This spell is implemented within SD2 for proper phase handling of the boss This reverts commit bf940b370c11920fc395412bc059adc0431f92ca. --- src/game/SpellAuras.cpp | 22 ++-------------------- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index d420ed5a5..77c35e518 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -1692,26 +1692,8 @@ void Aura::TriggerSpell() // case 70017: break; // // Ice Tomb // case 70157: break; - case 70842: // Mana Barrier - { - if (!triggerTarget || triggerTarget->getPowerType() != POWER_MANA) - return; - - int32 damage = triggerTarget->GetMaxHealth() - triggerTarget->GetHealth(); // IS >= 0 - if (damage == 0) // Already full health - return; - - if (triggerTarget->GetPower(POWER_MANA) < uint32(damage)) - { - damage = int32(triggerTarget->GetPower(POWER_MANA)); - triggerTarget->RemoveAurasDueToSpell(auraId); - } - - triggerTarget->DealHeal(triggerTarget, damage, auraSpellInfo); - triggerTarget->ModifyPower(POWER_MANA, -damage); - - return; - } +// // Mana Barrier // HANDLED IN SD2! +// case 70842: break; // // Summon Timer: Suppresser // case 70912: break; // // Aura of Darkness diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a514cbfbf..8afd51785 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 "12028" + #define REVISION_NR "12027" #endif // __REVISION_NR_H__