- Fixes to BuffActiveById to do a full set of checks including rank v…

…ersions.
DerpleMQ2 · Mar 29, 2024 · 9f96785 · 9f96785
1 parent 8f71873
commit 9f96785
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/class_configs/clr_class_config.lua b/class_configs/clr_class_config.lua
@@ -1178,14 +1178,14 @@ local _ClassConfig = {
                     local aaSpell = mq.TLO.Spell(mq.TLO.Me.AltAbility("Saint's Unity").Spell.Trigger(1).BaseName() or "")
                     local aaLevel = aaSpell and aaSpell.Level() or 0
                     return aaLevel < (spell.Level() or 0) and RGMercUtils.GetSetting('DoDruid') and spell.Stacks() and RGMercUtils.CanUseAA('Spirit Mastery') and
-                        not RGMercUtils.BuffActiveByID(spell.ID() or 0)
+                        not RGMercUtils.BuffActive(spell)
                 end,
             },
             {
                 name = "GroupHealProcBuff",
                 type = "Spell",
                 cond = function(self, spell)
-                    return spell.Stacks() and not RGMercUtils.BuffActiveByID(spell.ID())
+                    return RGMercUtils.SpellStacksOnMe(spell) and not RGMercUtils.BuffActive(spell)
                 end,
             },
         },
@@ -1357,7 +1357,7 @@ local _ClassConfig = {
         ['VetManaPCT']      = { DisplayName = "Vet Mana PCT", Category = "Spells and Abilities", Tooltip = "Use Spells", Default = 70, Min = 1, Max = 99, },
         ['DivineBuffOn']    = { DisplayName = "Divine Buff On", Category = "Spells and Abilities", Tooltip = "Use Spells", Default = false, },
         ['DoDruid']         = { DisplayName = "Do Druid", Category = "Spells and Abilities", Tooltip = "Use Spells", Default = false, },
-        ['DoCh']            = { DisplayName = "Do Ch", Category = "Heals", Tooltip = "Use Spells", Default = false, },
+        ['DoCH']            = { DisplayName = "Do CH", Category = "Heals", Tooltip = "Use Spells", Default = false, },
         ['DoSymbol']        = { DisplayName = "Do Symbol", Category = "Heals", Tooltip = "Use Spells", Default = false, },
     }, -- end DefaultConfig
 }

diff --git a/extras/version.lua b/extras/version.lua
@@ -1 +1 @@
-return { commitId = '68e53f0 2024-03-27' }
+return { commitId = '8f71873 2024-03-27' }
diff --git a/utils/rgmercs_utils.lua b/utils/rgmercs_utils.lua
@@ -3380,7 +3380,7 @@ end
 ---@return boolean
 function RGMercUtils.BuffActiveByID(buffId)
     if not buffId then return false end
-    return ((mq.TLO.Me.FindBuff("id " .. tostring(buffId)).ID() or 0) > 0)
+    return RGMercUtils.BuffActive(mq.TLO.Spell(buffId))
 end
 
 ---@param auraName string