Merge pull request #37 from Niroxbtw/master

Arrive check wait time for higher ping users
JellyLabScripts · Apr 24, 2023 · 2236d8e · 2236d8e
2 parents 93c29af + c70fd66
commit 2236d8e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/com/jelly/MightyMiner/config/Config.java b/src/main/java/com/jelly/MightyMiner/config/Config.java
@@ -202,6 +202,10 @@ public class Config extends cc.polyfrost.oneconfig.config.Config {
     @Slider( name = "MobKiller scan distance", category = COMMISSION_MACRO, subcategory = "Ice Walker / Goblin Killer", max = 30, min = 1)
     public int commKillerScanRange = 10;
 
+    @VigilanceName(name = "Arrive check wait time in ms", category = COMMISSION_MACRO, subcategory = "Warping")
+    @Slider( name = "Arrive check wait time in ms", category = COMMISSION_MACRO, subcategory = "Warping", max = 750, min = 200)
+    public int commArriveWaitTime = 10;
+
     @VigilanceName(name = "Stop on limbo", category = COMMISSION_MACRO, subcategory = "Failsafe")
     @Switch(name = "Stop on limbo", description = "Stop macro when getting kicked to limbo", category = COMMISSION_MACRO, subcategory = "Failsafe")
     public boolean stopOnLimbo = true;

diff --git a/src/main/java/com/jelly/MightyMiner/macros/macros/CommissionMacro.java b/src/main/java/com/jelly/MightyMiner/macros/macros/CommissionMacro.java
@@ -1008,7 +1008,7 @@ public void onTick(TickEvent.Phase phase) {
                                         }
                                         break;
                                     case ARRIVE_CHECK:
-                                        if (nextActionDelay.hasReached(300)) {
+                                        if (nextActionDelay.hasReached(MightyMiner.config.commArriveWaitTime)) {
                                             // Checking if player arrived at warp destination
                                             LogUtils.debugLog("Checking if player arrived at warp destination");
                                             if (BlockUtils.getPlayerLoc().down().equals((Object) currentWarpDestination)) {
@@ -1608,7 +1608,7 @@ public void onTick(TickEvent.Phase phase) {
                         }
                         break;
                     case ARRIVE_CHECK:
-                        if (nextActionDelay.hasReached(300)) {
+                        if (nextActionDelay.hasReached(MightyMiner.config.commArriveWaitTime)) {
                             // Checking if player arrived at warp destination
                             LogUtils.debugLog("Checking if player arrived at warp destination");
                             if (BlockUtils.getPlayerLoc().down().equals((Object) currentWarpDestination)) {