Added better checking for nil returns.

DerpleMQ2 · Jan 2, 2024 · 0d10f36 · 0d10f36
1 parent 02d5597
commit 0d10f36
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/class_configs/wiz_class_config.lua b/class_configs/wiz_class_config.lua
@@ -580,8 +580,8 @@ return {
                 active_cond = function(self) return mq.TLO.Me.FindBuff("id " .. tostring(mq.TLO.Me.AltAbility("Etherealist's Unity").Spell.Trigger(1).ID()))() ~= nil end,
                 cond = function(self)
                     local selfHPBuff = RGMercModules:execModule("Class", "GetResolvedActionMapItem", "SelfHPBuff")
-                    return not selfHPBuff() or
-                        (mq.TLO.Me.AltAbility("Etherealist's Unity").Spell.Trigger(1).Level() or 0) > selfHPBuff.Level() and RGMercUtils.SelfBuffAACheck("Etherealist's Unity")
+                    local selfHPBuffLevel = selfHPBuff and selfHPBuff() and selfHPBuff.Level() or 0
+                    return (mq.TLO.Me.AltAbility("Etherealist's Unity").Spell.Trigger(1).Level() or 0) > selfHPBuffLevel and RGMercUtils.SelfBuffAACheck("Etherealist's Unity")
                 end,
             },
             [2] = {
@@ -708,7 +708,7 @@ return {
                 type = "Spell",
                 cond = function(self, spell)
                     local fireClaw = RGMercModules:execModule("Class", "GetResolvedActionMapItem", "FireClaw")
-                    return not RGMercUtils.DetGambitCheck() and (not fireClaw or not fireClaw() or not mq.TLO.Me.SpellReady(fireClaw.RankName()))
+                    return not RGMercUtils.DetGambitCheck() and ((not fireClaw or not fireClaw()) or not mq.TLO.Me.SpellReady(fireClaw.RankName()))
                 end,
             },
             [20] = {
@@ -776,8 +776,8 @@ return {
                 active_cond = function(self) return mq.TLO.Me.FindBuff("id " .. tostring(mq.TLO.Me.AltAbility("Etherealist's Unity").Spell.Trigger(1).ID()))() ~= nil end,
                 cond = function(self)
                     local selfHPBuff = RGMercModules:execModule("Class", "GetResolvedActionMapItem", "SelfHPBuff")
-                    return not selfHPBuff() or
-                        (mq.TLO.Me.AltAbility("Etherealist's Unity").Spell.Trigger(1).Level() or 0) > selfHPBuff.Level() and RGMercUtils.SelfBuffAACheck("Etherealist's Unity")
+                    local selfHPBuffLevel = selfHPBuff and selfHPBuff() and selfHPBuff.Level() or 0
+                    return (mq.TLO.Me.AltAbility("Etherealist's Unity").Spell.Trigger(1).Level() or 0) > selfHPBuffLevel and RGMercUtils.SelfBuffAACheck("Etherealist's Unity")
                 end,
             },
             [3] = {
@@ -803,8 +803,8 @@ return {
                 active_cond = function(self) return mq.TLO.Me.FindBuff("id " .. tostring(mq.TLO.Me.AltAbility("Improved Familiar").Spell.ID()))() ~= nil end,
                 cond = function(self)
                     local familiarBuff = RGMercModules:execModule("Class", "GetResolvedActionMapItem", "FamiliarBuff")
-                    return not familiarBuff() or
-                        (mq.TLO.Me.AltAbility("Improved Familiar").Spell.Level() or 0) > familiarBuff.Level() and RGMercUtils.SelfBuffAACheck("Improved Familiar")
+                    local familiarBuffLevel = familiarBuff and familiarBuff() and familiarBuff.Level() or 0
+                    return (mq.TLO.Me.AltAbility("Improved Familiar").Spell.Level() or 0) > familiarBuffLevel and RGMercUtils.SelfBuffAACheck("Improved Familiar")
                 end,
             },
             [6] = {

diff --git a/modules/class.lua b/modules/class.lua
@@ -97,7 +97,7 @@ function Module:Init()
 end
 
 function Module:GetResolvedActionMapItem(item)
-    if self.ReloadingLoadouts then return "" end
+    if self.ReloadingLoadouts then return nil end
     return self.ResolvedActionMap[item]
 end
 

diff --git a/utils/rgmercs_utils.lua b/utils/rgmercs_utils.lua
@@ -1391,7 +1391,7 @@ function Utils.DetGambitCheck()
     ---@type spell
     local gambitSpell = RGMercModules:execModule("Class", "GetResolvedActionMapItem", "GambitSpell")
 
-    return type(gambitSpell) == "userdata" and gambitSpell and gambitSpell() and (me.Song(gambitSpell.RankName()).ID() > 0)
+    return gambitSpell and gambitSpell() and (me.Song(gambitSpell.RankName()).ID() > 0)
 end
 
 function Utils.DetAACheck(aaId)

diff --git a/version.lua b/version.lua
@@ -1 +1 @@
-return { commitId = 'eb9442e 2024-01-01' }
+return { commitId = '02d5597 2024-01-01' }