From 79fb411190ef0fd8d8fd7c5d1fafd5720bb9080d Mon Sep 17 00:00:00 2001 From: BillLive Date: Wed, 6 Jan 2016 19:20:06 +1030 Subject: [PATCH] Signed-off-by: BillLive --- Elementarist.lua | 6 +++--- modules/elemental.lua | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Elementarist.lua b/Elementarist.lua index f0c6d70..7a439a9 100755 --- a/Elementarist.lua +++ b/Elementarist.lua @@ -55,8 +55,8 @@ Elementarist.tier7Talent = nil Elementarist.hasT17_4pcs = false Elementarist.hasT18_4pcs = false Elementarist.hasT18_Class_Trinket = false -Elementarist.lastSpell = nil -Elementarist.lastCastTime = nil +Elementarist.lastSpell = "" +Elementarist.lastCastTime = 0 Elementarist.CustomIDs = { ["Alchemist's Flask Item"] = 75525, ["Alchemist's Flask Spell"] = 79640, @@ -1020,7 +1020,7 @@ function Elementarist:DecideSpells() else Elementarist.textList["next2"]:SetText("") end - + Elementarist:Debug(GetTime(), "LastCast " .. Elementarist.lastSpell .. "1:" .. spell .. " 2:" .. spell1 .. " 3:" .. spell2 ) end if (not ElementaristDB.disableMini) then diff --git a/modules/elemental.lua b/modules/elemental.lua index eb33ddd..f786aff 100755 --- a/modules/elemental.lua +++ b/modules/elemental.lua @@ -108,10 +108,10 @@ Elementarist.elemental = { Elementarist.lastCastTime = sICendTime; timeshift = timeshift + (sICendTime / 1000) - GetTime() else --- -- to prevent tick in current spell, check if last one finished in short time --- if (Elementarist.lastCastTime) and ((Elementarist.lastCastTime / 1000) + Elementarist.lastBaseGCD >= GetTime() ) then --- spellInCast = Elementarist.lastSpell; --- end + -- to prevent tick in current spell, check if last one finished in short time + if (Elementarist.lastCastTime) and ((Elementarist.lastCastTime / 1000) + Elementarist.lastBaseGCD >= GetTime() ) then + spellInCast = Elementarist.lastSpell; + end -- -- no spell in cast, check global cd via Ghost Wolf if (Elementarist.SpellList["Ghost Wolf"]) then -- 1.7.9.5