Another attempt to fix getting stuck in limbo

JellyLabScripts · Oct 31, 2024 · 78763f1 · 78763f1
1 parent 98ebe2e
commit 78763f1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 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.8.12
+version=2.8.13-pre1
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/failsafe/impl/WorldChangeFailsafe.java b/src/main/java/com/jelly/farmhelperv2/failsafe/impl/WorldChangeFailsafe.java
@@ -64,6 +64,7 @@ public void onTickDetection(TickEvent.ClientTickEvent event) {
         if (FailsafeManager.getInstance().triggeredFailsafe.isPresent()
                 && FailsafeManager.getInstance().triggeredFailsafe.get().getType() == FailsafeManager.EmergencyType.WORLD_CHANGE_CHECK)
             return;
+        if (FailsafeManager.getInstance().emergencyQueue.contains(this)) return;
         if (GameStateHandler.getInstance().getLocation() != GameStateHandler.Location.LIMBO) return;
         LogUtils.sendWarning("[Failsafe Debug] You've been kicked to limbo! #2");
         FailsafeManager.getInstance().possibleDetection(this);
@@ -142,7 +143,7 @@ public void duringFailsafeTrigger() {
                 break;
             case TAKE_ACTION:
                 if (GameStateHandler.getInstance().getLocation() == GameStateHandler.Location.TELEPORTING
-                        || LagDetector.getInstance().isLagging() || GameStateHandler.getInstance().getLocation() == GameStateHandler.Location.UNKNOWN) {
+                        || GameStateHandler.getInstance().getLocation() == GameStateHandler.Location.UNKNOWN) {
                     FailsafeManager.getInstance().scheduleDelay(1000);
                     return;
                 }

diff --git a/src/main/java/com/jelly/farmhelperv2/handler/GameStateHandler.java b/src/main/java/com/jelly/farmhelperv2/handler/GameStateHandler.java
@@ -149,7 +149,7 @@ public void onTablistUpdate(UpdateTablistEvent event) {
         List<String> tabList = new ArrayList<>(event.tablist);
 
         List<String> scoreboardLines = ScoreboardUtils.getScoreboardLines(true);
-        if (tabList.size() == 1 && PlayerUtils.isInventoryEmpty(mc.thePlayer)) {
+        if (PlayerUtils.isInventoryEmpty(mc.thePlayer) && scoreboardLines.isEmpty() && mc.thePlayer.experienceLevel == 0 && mc.thePlayer.dimension == 1) {
             lastLocation = location;
             location = Location.LIMBO;
             return;