upgrade version to 1.2.5 and fix bug AreYouStillThere

9-9-9-9 · Aug 29, 2021 · eb1cb4d · eb1cb4d
1 parent 95015d3
commit eb1cb4d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -5,6 +5,7 @@
 
 have inspiration from https://github.com/tiemonl/Bit-Heroes-Fishing-Bot
 
+**If you like my bot, please give this repo a Star, thanks**
 ___
 [Wiki version](https://github.com/9-9-9-9/Bit-Heroes-bot/wiki)
 

diff --git a/README.release.md b/README.release.md
@@ -6,6 +6,8 @@ ___
 ## Bit Heroes bot
 ##### on Linux / Windows / ~~MacOS~~
 
+**If you like my bot, please give this repo a Star, thanks**
+
 [Wiki version](https://github.com/9-9-9-9/Bit-Heroes-bot/wiki)
 
 This readme file is for normal users

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>bh.bot</groupId>
     <artifactId>BitHeroes</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
 
     <dependencies>
     </dependencies>

diff --git a/src/main/java/bh/bot/app/AfkApp.java b/src/main/java/bh/bot/app/AfkApp.java
@@ -115,6 +115,8 @@ private void doLoop(
         final short loopSleep = 5_000;
         final short originalCheckAreYouStillThereAfter = 20_000 / loopSleep;
         short checkAreYouStillThereAfter = originalCheckAreYouStillThereAfter;
+        final short originalSleepWhileWaitingResourceRegen = 5 * 60_000 / loopSleep;
+        short sleepWhileWaitingResourceRegen = 0;
 
         ML:
         while (!masterSwitch.get()) {
@@ -136,16 +138,21 @@ private void doLoop(
                     InteractionUtil.Keyboard.sendEnter();
                     sleep(1_000);
                     InteractionUtil.Keyboard.sendEscape();
-                    checkAreYouStillThereAfter = originalCheckAreYouStillThereAfter;
-                } else {
                     checkAreYouStillThereAfter = 2;
+                } else {
+                    checkAreYouStillThereAfter = originalCheckAreYouStillThereAfter;
                 }
                 continue ML;
             }
 
+            if (sleepWhileWaitingResourceRegen > 0) {
+                sleepWhileWaitingResourceRegen--;
+                continue ML;
+            }
+
             if (taskList.stream().allMatch(x -> !isNotBlocked(x._2))) {
                 info("Waiting for resource generation, sleeping %d minutes", minutesSleepWaitingResourceGeneration);
-                sleep(minutesSleepWaitingResourceGeneration * 60_000);
+                sleepWhileWaitingResourceRegen = originalSleepWhileWaitingResourceRegen;
                 continue ML;
             }