diff SkeletonKey/ActionTemplates.lua @ 57:9eebce04e69b

- Prevent bind settings from being updated in combat. - Close the UI during combat. - Resolve conflicting keybinds and inform the user of any results. - Resolve conflicts for talents, but only when they are active.
author Nenue
date Mon, 22 Aug 2016 09:24:02 -0400
parents 2a95f4010c5a
children 04c23ceaf9e0
line wrap: on
line diff
--- a/SkeletonKey/ActionTemplates.lua	Sun Aug 21 07:19:01 2016 -0400
+++ b/SkeletonKey/ActionTemplates.lua	Mon Aug 22 09:24:02 2016 -0400
@@ -328,23 +328,21 @@
           spellCache[k] = v
         end
       end
-      petSpellCache = spellCache
     end
+    petSpellCache = spellCache
     if petSubtextCache then
       for k,v in pairs(petSubtextCache) do
         if not subtextCache[k] then
           subtextCache[k] = v
         end
       end
-      petSubtextCache = subtextCache
     end
+    petSubtextCache = subtextCache
   else
     petSpellCache = {}
     petSubtextCache = {}
   end
 
-
-
   if PetHasSpellbook() then
     print('PET SPELLBOOK')
     local i = 1