From 959b4cddbd400cb256a6d53c297a6d67154f6c5f Mon Sep 17 00:00:00 2001
From: Brady <zeromemesdev@gmail.com>
Date: Mon, 19 Jun 2023 15:29:30 -0500
Subject: [PATCH] Remove unneeded `while (true)`

---
 .../baritone/behavior/ElytraBehavior.java     | 43 ++++++++-----------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/main/java/baritone/behavior/ElytraBehavior.java b/src/main/java/baritone/behavior/ElytraBehavior.java
index 5a8614edc..a0502d930 100644
--- a/src/main/java/baritone/behavior/ElytraBehavior.java
+++ b/src/main/java/baritone/behavior/ElytraBehavior.java
@@ -63,6 +63,7 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
     private final NetherPathfinderContext context;
     private final PathManager pathManager;
     private int sinceFirework;
+    private BlockStateInterface bsi;
 
     public ElytraBehavior(Baritone baritone) {
         super(baritone);
@@ -212,30 +213,26 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
                 return;
             }
 
-            outer:
-            while (true) {
-                int rangeStartIncl = playerNear;
-                int rangeEndExcl = playerNear;
-                while (rangeEndExcl < path.size() && ctx.world().isBlockLoaded(path.get(rangeEndExcl), false)) {
-                    rangeEndExcl++;
-                }
-                if (rangeStartIncl >= rangeEndExcl) {
-                    // not loaded yet?
+            int rangeStartIncl = playerNear;
+            int rangeEndExcl = playerNear;
+            while (rangeEndExcl < path.size() && ctx.world().isBlockLoaded(path.get(rangeEndExcl), false)) {
+                rangeEndExcl++;
+            }
+            if (rangeStartIncl >= rangeEndExcl) {
+                // not loaded yet?
+                return;
+            }
+            if (!passable(ctx.world().getBlockState(path.get(rangeStartIncl)))) {
+                // we're in a wall
+                return; // previous iterations of this function SHOULD have fixed this by now :rage_cat:
+            }
+            for (int i = rangeStartIncl; i < rangeEndExcl - 1; i++) {
+                if (!clearView(pathAt(i), pathAt(i + 1))) {
+                    // obstacle. where do we return to pathing?
+                    // find the next valid segment
+                    this.pathRecalcSegment(i, rangeEndExcl - 1);
                     return;
                 }
-                if (!passable(ctx.world().getBlockState(path.get(rangeStartIncl)))) {
-                    // we're in a wall
-                    return; // previous iterations of this function SHOULD have fixed this by now :rage_cat:
-                }
-                for (int i = rangeStartIncl; i < rangeEndExcl - 1; i++) {
-                    if (!clearView(pathAt(i), pathAt(i + 1))) {
-                        // obstacle. where do we return to pathing?
-                        // find the next valid segment
-                        this.pathRecalcSegment(i, rangeEndExcl - 1);
-                        break outer;
-                    }
-                }
-                break;
             }
         }
 
@@ -582,8 +579,6 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
         return bestPitch;
     }
 
-    private BlockStateInterface bsi;
-
     public boolean passable(int x, int y, int z) {
         return passable(this.bsi.get0(x, y, z));
     }