0da3db7 - Add Conflagration

[wowui.git] / OmaCD / Cooldowns.lua

diff --git a/OmaCD/Cooldowns.lua b/OmaCD/Cooldowns.lua
index 9c7add4..6e3ce70 100644 (file)
--- a/OmaCD/Cooldowns.lua
+++ b/OmaCD/Cooldowns.lua
@@ -169,6 +169,7 @@ local function getFrame()
     return frame;
 end
 local function updateCD(guid, specid, spellid)
     return frame;
 end
 local function updateCD(guid, specid, spellid)

+    if not guidToId[guid] then return end

     -- update cd value
     local cd = trackedcds[specid][spellid];
     if cdfixes[guid] then cd = cd + cdfixes[guid] end
     -- update cd value
     local cd = trackedcds[specid][spellid];
     if cdfixes[guid] then cd = cd + cdfixes[guid] end


@@ -196,7 +197,7 @@ end
 
 local function updateUnitCD(guid)
     local specid = guidToSpecid[guid];
 
 local function updateUnitCD(guid)
     local specid = guidToSpecid[guid];

-    if specid then
+    if specid and trackedcds[specid] then

         for spellid, _ in pairs(trackedcds[specid]) do
             updateCD(guid, specid, spellid);
         end
         for spellid, _ in pairs(trackedcds[specid]) do
             updateCD(guid, specid, spellid);
         end


@@ -232,7 +233,7 @@ local function monkTick()
     if not InCombatLockdown() then
         for guid, _ in pairs(monks) do
             local id = guidToId[guid];
     if not InCombatLockdown() then
         for guid, _ in pairs(monks) do
             local id = guidToId[guid];

-            if id then OmaInspect.Request(guid, id, updateMonk) end
+            if id then OmaInspect.Request(guid, id, updateMonk, true) end

         end
     end
     CTimerAfter(10, monkTick);
         end
     end
     CTimerAfter(10, monkTick);


@@ -253,7 +254,7 @@ end
 local function updatePriest(guid, specid)
     local id = guidToId[guid];
     if id then
 local function updatePriest(guid, specid)
     local id = guidToId[guid];
     if id then

-        if guidToSpecid[guid] ~= specid then
+        if guidToSpecid[guid] ~= specid and frames[guid] then

             for _, frame in pairs(frames[guid]) do
                 removeFrame(frame);
             end
             for _, frame in pairs(frames[guid]) do
                 removeFrame(frame);
             end