Bst error fixes for missing spells

DerpleMQ2 · Mar 20, 2024 · dcc38b4 · dcc38b4
1 parent e6449d5
commit dcc38b4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/class_configs/bst_class_config.lua b/class_configs/bst_class_config.lua
@@ -717,23 +717,27 @@ return {
     },
     ['HelperFunctions']   = {
         BeastialAligmentCheck = function(self)
-            return not RGMercUtils.SongActiveByName(self.ResolvedActionMap['HHEFuryDisc'].RankName() or "None") and
+            local discSpell = self.ResolvedActionMap['HHEFuryDisc']
+            return discSpell and discSpell() and not RGMercUtils.SongActiveByName(discSpell.RankName()) and
                 not RGMercUtils.SongActiveByName('Bestial Alignment') and
                 not RGMercUtils.BuffActiveByName('Ferociousness')
         end,
         HHEFuryDiscCheckPrimary = function(self)
-            return not RGMercUtils.SongActiveByName(self.ResolvedActionMap['HHEFuryDisc'].RankName() or "None") and
+            local discSpell = self.ResolvedActionMap['HHEFuryDisc']
+            return discSpell and discSpell() and not RGMercUtils.SongActiveByName(discSpell.RankName()) and
                 not RGMercUtils.SongActiveByName('Bestial Alignment') and
                 not RGMercUtils.BuffActiveByName('Ferociousness') and
                 not RGMercUtils.PCAAReady("Bestial Alignment")
         end,
         HHEFuryDiscCheckSecondary = function(self)
-            return RGMercUtils.SongActiveByName(self.ResolvedActionMap['HHEFuryDisc'].RankName() or "None") and
+            local discSpell = self.ResolvedActionMap['HHEFuryDisc']
+            return discSpell and discSpell() and not RGMercUtils.SongActiveByName(discSpell.RankName()) and
                 not RGMercUtils.SongActiveByName('Bestial Alignment') and
                 not RGMercUtils.BuffActiveByName('Ferociousness')
         end,
         FerociousnessCheck = function(self)
-            return not RGMercUtils.SongActiveByName(self.ResolvedActionMap['HHEFuryDisc'].RankName() or "None") and
+            local discSpell = self.ResolvedActionMap['HHEFuryDisc']
+            return discSpell and discSpell() and not RGMercUtils.SongActiveByName(discSpell.RankName()) and
                 not RGMercUtils.SongActiveByName('Bestial Alignment')
         end,
     },
@@ -959,7 +963,7 @@ return {
                 name = "BeastialBuffDisc",
                 type = "Disc",
                 cond = function(self, discSpell, target)
-                    return RGMercUtils.BuffActiveByID(discSpell.ID())
+                    return RGMercUtils.BuffActive(discSpell)
                 end,
             },
             {

diff --git a/extras/version.lua b/extras/version.lua
@@ -1 +1 @@
-return { commitId = '6f71c9c 2024-03-17' }
+return { commitId = 'e6449d5 2024-03-19' }