From 7947d09233653b5c0018b104af5561ef532ad419 Mon Sep 17 00:00:00 2001
From: unknown <exra@.(none)>
Date: Tue, 15 Nov 2011 13:57:04 -0500
Subject: [PATCH] fix blood tap. will now work when both runes are on cd and will also use the rune with the lowest cd if both are on cd

---
 src/server/game/Spells/SpellEffects.cpp |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 3767b6b..8bde10f 100755
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -6970,10 +6970,36 @@ void Spell::EffectActivateRune(SpellEffIndex effIndex)
     {
         if (player->GetRuneCooldown(j) && player->GetCurrentRune(j) == RuneType(m_spellInfo->Effects[effIndex].MiscValue))
         {
+			if (m_spellInfo->Id == 45529)
+				if(player->GetBaseRune(j) != RuneType(m_spellInfo->Effects[effIndex].MiscValueB))
+					continue;
             player->SetRuneCooldown(j, 0);
             --count;
         }
     }
+
+	// Blood Tap
+	if (m_spellInfo->Id == 45529 && count > 0) {
+		for (uint32 l = 0; l < MAX_RUNES && count > 0; ++l)
+		{
+			// Check if both runes are on cd as that is the only time when this needs to come into effect
+			if ((player->GetRuneCooldown(l) && player->GetCurrentRune(l) == RuneType(m_spellInfo->Effects[effIndex].MiscValueB)) && (player->GetRuneCooldown(l+1) && player->GetCurrentRune(l+1) == RuneType(m_spellInfo->Effects[effIndex].MiscValueB)))
+			{
+				// Should always update the rune with the lowest cd
+				if (player->GetRuneCooldown(l) >= player->GetRuneCooldown(l+1))
+					l++;
+				player->SetRuneCooldown(l, 0);
+				--count;
+				// is needed to push through to the client that the rune is active
+				player->ResyncRunes(MAX_RUNES);
+			}
+			else
+			{
+				break;
+			}
+		}
+	}
+
     // Empower rune weapon
     if (m_spellInfo->Id == 47568)
     {
--
1.7.3.1.msysgit.0