Scheduler:

= Quick Scheduler hotfix
JellyLabScripts · Apr 27, 2024 · cb54f09 · cb54f09
1 parent 686a534
commit cb54f09
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2
 mcVersion=1.8.9
 modid=farmhelperv2
 modName=FarmHelper
-version=2.6.8
+version=2.6.9
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoSell.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoSell.java
@@ -131,8 +131,6 @@ public void stop() {
         if (MacroHandler.getInstance().isMacroToggled() && !VisitorsMacro.getInstance().isRunning()) {
             Multithreading.schedule(() -> MacroHandler.getInstance().resumeMacro(), 1000, TimeUnit.MILLISECONDS);
         }
-        if (FarmHelperConfig.enableScheduler && !VisitorsMacro.getInstance().isRunning())
-            Scheduler.getInstance().resume();
         IFeature.super.stop();
     }
 
@@ -174,8 +172,6 @@ public void enable(boolean manually) {
             dontEnableForClock.reset();
         }
         KeyBindUtils.stopMovement();
-        if (FarmHelperConfig.enableScheduler)
-            Scheduler.getInstance().pause();
         if (MacroHandler.getInstance().isMacroToggled()) {
             MacroHandler.getInstance().pauseMacro();
         }

diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/Scheduler.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/Scheduler.java
@@ -113,7 +113,8 @@ public void pause() {
 
     public void resume() {
         LogUtils.sendDebug("[Scheduler] Resuming");
-        schedulerClock.resume();
+        if (FarmHelperConfig.pauseSchedulerDuringJacobsContest && !GameStateHandler.getInstance().inJacobContest())
+            schedulerClock.resume();
     }
 
     public void farmingTime() {

diff --git a/src/main/java/com/jelly/farmhelperv2/handler/MacroHandler.java b/src/main/java/com/jelly/farmhelperv2/handler/MacroHandler.java
@@ -277,8 +277,7 @@ public void resumeMacro() {
             macroingTimer.resume();
             analyticsTimer.resume();
             afterRewarpDelay.reset();
-            if (!Scheduler.getInstance().getSchedulerClock().isPaused())
-                Scheduler.getInstance().resume();
+            Scheduler.getInstance().resume();
         });
     }