Quantcast

Unleash Elements not advised when Flame Burst is casting

Taracque [05-19-11 - 14:15]
Unleash Elements not advised when Flame Burst is casting
Filename
Elementarist.lua
diff --git a/Elementarist.lua b/Elementarist.lua
index 1a05b31..f2e2c94 100755
--- a/Elementarist.lua
+++ b/Elementarist.lua
@@ -721,7 +721,7 @@ function Elementarist:NextSpell(timeshift,exspell1,exspell2)
 	-- Unleash Elements if LvB will be available after it, Weapon enchant is Flamtounge Weapon, and Unleash Elements are not on CD
 	if (ElementaristDB.EnableUE) then
 		if (exspell1 ~= Elementarist.SpellList["Unleash Elements"]) and (exspell2 ~= Elementarist.SpellList["Unleash Elements"]) then
-			if (IsSpellInRange(Elementarist.SpellList["Unleash Elements"], "target") == 1) then
+			if (IsSpellInRange(Elementarist.SpellList["Unleash Elements"], "target") == 1) and ( (Elementarist.SpellList["Lava Burst"]) ~= spellInCast) then
 				local hasMainHandEnchant, _, _, _, _, _ = GetWeaponEnchantInfo()
 				if (hasMainHandEnchant) then
 					d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Lava Burst"])
@@ -777,7 +777,7 @@ function Elementarist:NextSpell(timeshift,exspell1,exspell2)
 		end
 	end

-	-- Earth shock if Lightning Shield count >=9 and not on cd or FS debuff remaining between > FS cd + 2sec and LS count>=7
+	-- Earth shock if Lightning Shield count >=9 and not on cd or FS debuff remaining between FS and FS cd + 2sec and LS count>=7
 	if ( (exspell1 ~= Elementarist.SpellList["Earth Shock"]) and (exspell2 ~= Elementarist.SpellList["Earth Shock"]) ) then
 		d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Earth Shock"])
 		local _, _, _, lscount = Elementarist:hasBuff("player",Elementarist.SpellList["Lightning Shield"])