idk what i'm doing anymore

JellyLabScripts · Jul 8, 2024 · 0a79642 · 0a79642
1 parent b60f5d2
commit 0a79642
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/main/java/com/jelly/farmhelperv2/failsafe/impl/LowerAvgBpsFailsafe.java b/src/main/java/com/jelly/farmhelperv2/failsafe/impl/LowerAvgBpsFailsafe.java
@@ -61,13 +61,15 @@ public boolean shouldAltTab() {
 
     @Override
     public void onTickDetection(TickEvent.ClientTickEvent event) {
-        if (MacroHandler.getInstance().isCurrentMacroPaused()
-                || FeatureManager.getInstance().shouldPauseMacroExecution()
-                || !MacroHandler.getInstance().getMacro().checkForBPS()
-                || !FarmHelperConfig.averageBPSDropCheck
-                || event.phase != TickEvent.Phase.START) {
+        if (FeatureManager.getInstance().shouldPauseMacroExecution()
+                || BPSTracker.getInstance().dontCheckForBPS()
+                || !FarmHelperConfig.averageBPSDropCheck) {
+            if (clock.isScheduled())
+                clock.reset();
             return;
         }
+        if (event.phase != TickEvent.Phase.START)
+            return;
 
         if (BPSTracker.getInstance().getBPSFloat() - lastBPS < 0) {
             if (!clock.isScheduled())

diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/BPSTracker.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/BPSTracker.java
@@ -9,6 +9,7 @@
 import net.minecraft.block.BlockCrops;
 import net.minecraft.block.BlockNetherWart;
 import net.minecraft.block.BlockReed;
+import net.minecraft.client.Minecraft;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.Tuple;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -132,7 +133,10 @@ public String getBPS() {
     public boolean dontCheckForBPS() {
         return !MacroHandler.getInstance().getMacroingTimer().isScheduled()
                 || MacroHandler.getInstance().isCurrentMacroPaused()
-                || !MacroHandler.getInstance().getMacro().checkForBPS();
+                || !MacroHandler.getInstance().getMacro().checkForBPS()
+                || MacroHandler.getInstance().isTeleporting()
+                || MacroHandler.getInstance().isRewarpTeleport()
+                || MacroHandler.getInstance().isStartingUp();
     }
 
     public float getBPSFloat() {