Macros:

= Restoring state changes Last one today, I promise
JellyLabScripts · Apr 28, 2024 · 32dc0a4 · 32dc0a4
1 parent 34e2bf3
commit 32dc0a4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 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.15
+version=2.6.16
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/handler/GameStateHandler.java b/src/main/java/com/jelly/farmhelperv2/handler/GameStateHandler.java
@@ -115,8 +115,6 @@ public class GameStateHandler {
     private int speed = 0;
     @Setter
     private boolean updatedState = false;
-    @Setter
-    private boolean startedMoving = false;
 
     public static GameStateHandler getInstance() {
         if (INSTANCE == null) {
@@ -522,7 +520,7 @@ public void onTickCheckMoving() {
         dz = Math.abs(mc.thePlayer.motionZ);
 
         if (notMoving() && mc.currentScreen == null) {
-            if (startedMoving && hasPassedSinceStopped() && !PlayerUtils.isStandingOnRewarpLocation()) {
+            if (hasPassedSinceStopped() && !PlayerUtils.isStandingOnRewarpLocation()) {
                 if (DirtFailsafe.getInstance().hasDirtBlocks() && DirtFailsafe.getInstance().isTouchingDirtBlock()) {
                     FailsafeManager.getInstance().possibleDetection(DirtFailsafe.getInstance());
                 } else {
@@ -535,7 +533,6 @@ public void onTickCheckMoving() {
                 }
             }
         } else {
-            startedMoving = true;
             notMovingTimer.schedule();
         }
 

diff --git a/src/main/java/com/jelly/farmhelperv2/macro/AbstractMacro.java b/src/main/java/com/jelly/farmhelperv2/macro/AbstractMacro.java
@@ -303,7 +303,6 @@ public void onEnable() {
             restoredState = true;
             savedState = Optional.empty();
             GameStateHandler.getInstance().setUpdatedState(true);
-            GameStateHandler.getInstance().setStartedMoving(false);
         }
         if (!closest90Deg.isPresent())
             setClosest90Deg(Optional.of(AngleUtils.getClosest(getYaw())));