From 1517fe37ea1740fca65566cac1253629eab48351 Mon Sep 17 00:00:00 2001
From: Taracque <taracque@taracque.hu>
Date: Thu, 4 Oct 2012 12:00:27 +0200
Subject: [PATCH] Fixed: Elemental Blast now in the right place in the
 priority list

---
 Change_log.txt   |    3 +++
 Elementarist.lua |   30 ++++++++++++++++--------------
 Elementarist.toc |    2 +-
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Change_log.txt b/Change_log.txt
index 9051204..0af92d1 100755
--- a/Change_log.txt
+++ b/Change_log.txt
@@ -1,3 +1,6 @@
+**v2.9.9**
+* Fixed: Elemental Blast now in the right place in the priority list
+
 **v2.9.8**
 * Fixed: Unleashed Fury now works as expected
 
diff --git a/Elementarist.lua b/Elementarist.lua
index c934eeb..c5cfdc2 100755
--- a/Elementarist.lua
+++ b/Elementarist.lua
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Elementarist 2.9.8
+-- Elementarist 2.9.9
 --
 -- Shows the advised spell for an elemental shaman for optimal DPS output.
 -------------------------------------------------------------------------------
@@ -753,19 +753,6 @@ function Elementarist:NextSpellElem(timeshift,exspell1,exspell2)
 				end
 			end
 		end
-	-- if Tier6 talent is Elemental Blast use it
-	elseif (Elementarist.tier6Talent == 18) then
-		if (
-			(exspell1 ~= Elementarist.SpellList["Elemental Blast"]) and
-			(exspell2 ~= Elementarist.SpellList["Elemental Blast"]) and
-			(IsSpellInRange(Elementarist.SpellList["Elemental Blast"], "target") == 1) and 
-			(Elementarist.SpellList["Elemental Blast"] ~= spellInCast)
-		) then
-			d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Elemental Blast"])
-			if ((d - timeshift) <= 0) then
-				return Elementarist.SpellList["Elemental Blast"]
-			end
-		end
 	end
 
 	-- check if Flame shock applied on target first
@@ -841,6 +828,21 @@ function Elementarist:NextSpellElem(timeshift,exspell1,exspell2)
 		end
 	end
 
+	-- if Tier6 talent is Elemental Blast use it
+	if (Elementarist.tier6Talent == 18) then
+		if (
+			(exspell1 ~= Elementarist.SpellList["Elemental Blast"]) and
+			(exspell2 ~= Elementarist.SpellList["Elemental Blast"]) and
+			(IsSpellInRange(Elementarist.SpellList["Elemental Blast"], "target") == 1) and 
+			(Elementarist.SpellList["Elemental Blast"] ~= spellInCast)
+		) then
+			d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Elemental Blast"])
+			if ((d - timeshift) <= 0) then
+				return Elementarist.SpellList["Elemental Blast"]
+			end
+		end
+	end
+
 	-- otherwise lightning bolt
 	if IsSpellInRange(Elementarist.SpellList["Lightning Bolt"], "target") == 1 then
 		return Elementarist.SpellList["Lightning Bolt"]
diff --git a/Elementarist.toc b/Elementarist.toc
index b651a29..63e7fa9 100755
--- a/Elementarist.toc
+++ b/Elementarist.toc
@@ -2,7 +2,7 @@
 ## Title: Elementarist
 ## Notes: Elemental shaman spell rotation helper
 ## Author: Taracque, Felmosórongy of Arathor
-## Version: 2.9.8
+## Version: 2.9.9
 ## SavedVariables: ElementaristDB
 ## OptionalDeps: OmniCC, SpellFlash
 ## Dependencies: 
-- 
1.7.9.5