Pull abort if disabled.

DerpleMQ2 · Jan 5, 2024 · 25281ec · 25281ec
1 parent 9393dd7
commit 25281ec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/extras/version.lua b/extras/version.lua
@@ -1 +1 @@
-return { commitId = '4990265 2024-01-05' }
+return { commitId = '9393dd7 2024-01-05' }
diff --git a/modules/pull.lua b/modules/pull.lua
@@ -548,7 +548,7 @@ function Module:CheckGroupForPull(classes, resourceStartPct, resourceStopPct, ca
                     RGMercUtils.PrintGroupMessage("%s is low on hp - Holding pulls!", member.CleanName())
                     return false
                 end
-                if member.PctMana() < resourcePct then
+                if member.Class.CanCast() and member.PctMana() < resourcePct then
                     RGMercUtils.PrintGroupMessage("%s is low on mana - Holding pulls!", member.CleanName())
                     return false
                 end
@@ -691,6 +691,11 @@ function Module:CheckForAbort(pullID)
         return true
     end
 
+    if not self.settings.DoPull or RGMercConfig.Globals.PauseMain then
+        RGMercsLogger.log_debug("\ar ALERT: Pulling Disabled at user request. \ax")
+        return true
+    end
+
     if pullID == 0 then return true end
 
     RGMercsLogger.log_verbose("Checking for abort on spawn id: %d", pullID)