From b97b937f70e2384e798fd753b44fab6fbb19ab45 Mon Sep 17 00:00:00 2001
From: Spyder <serge@arkania.net>
Date: Fri, 16 Dec 2011 20:32:41 -0600
Subject: [PATCH] Remove hacky implementation of Elemental Oath Properly fix it
 by correcting DBC data Fix Clearcasting from Elemental Oath damage bonus
 being displayed twice in Spell ToolTips by damage Addons like DrDamage
 (displaying 10.25% instead of 5%, 21% instead of 10%) thanks to: Havenard

---
 .../game/Spells/Auras/SpellAuraEffects.cpp    | 32 +++++++------------
 src/server/game/Spells/SpellMgr.cpp           |  7 ++++
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 6f0b4092..0a2eac43 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -1071,25 +1071,6 @@ void AuraEffect::CalculateSpellMod() {
 		default:
 			break;
 		}
-	case SPELL_AURA_MOD_SPELL_CRIT_CHANCE:
-		switch (GetId()) {
-		case 51466: // Elemental oath
-		case 51470: // Elemental oath
-			// "while Clearcasting from Elemental Focus is active, you deal 5%/10% more spell damage."
-			if (!m_spellmod) {
-				m_spellmod = new SpellModifier(GetBase());
-				m_spellmod->op = SPELLMOD_EFFECT2;
-				m_spellmod->type = SPELLMOD_FLAT;
-				m_spellmod->spellId = GetId();
-				m_spellmod->mask[1] = 0x0004000;
-			}
-			m_spellmod->value = GetBase()->GetUnitOwner()->CalculateSpellDamage(
-					GetBase()->GetUnitOwner(), GetSpellProto(), 1);
-			break;
-		default:
-			break;
-		}
-		break;
 	case SPELL_AURA_ADD_FLAT_MODIFIER:
 	case SPELL_AURA_ADD_PCT_MODIFIER:
 		if (!m_spellmod) {
@@ -5556,7 +5537,18 @@ void AuraEffect::HandleAuraModIncreaseEnergyPercent(
 
 	UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + powerType);
 
-	target->HandleStatModifier(unitMod, TOTAL_PCT, float(GetAmount()), apply);
+    float amount = float(GetAmount());
+	
+    if (apply)
+    {
+        target->HandleStatModifier(unitMod, TOTAL_PCT, amount, apply);
+        target->ModifyPowerPct(powerType, amount, apply);
+    }
+    else
+    {
+        target->ModifyPowerPct(powerType, amount, apply);
+        target->HandleStatModifier(unitMod, TOTAL_PCT, amount, apply);
+    }
 }
 
 void AuraEffect::HandleAuraModIncreaseHealthPercent(
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 5fa55a2e..a4517624 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -4233,6 +4233,13 @@ void SpellMgr::LoadSpellCustomAttr() {
 			spellInfo->Stances = 1 << (FORM_TREE - 1);
 			count++;
 			break;
+            case 51466: // Elemental Oath (Rank 1)
+            case 51470: // Elemental Oath (Rank 2)
+                spellInfo->Effect[EFFECT_1] = SPELL_EFFECT_APPLY_AURA;
+                spellInfo->EffectApplyAuraName[EFFECT_1] = SPELL_AURA_ADD_FLAT_MODIFIER;
+                spellInfo->EffectMiscValue[EFFECT_1] = SPELLMOD_EFFECT2;
+                spellInfo->EffectSpellClassMask[EFFECT_1] = flag96(0x00000000, 0x00004000, 0x00000000);
+                break;			
 		case 47569: // Improved Shadowform (Rank 1)
 			// with this spell atrribute aura can be stacked several times
 			spellInfo->Attributes &= ~SPELL_ATTR0_NOT_SHAPESHIFT;