From c4f33b72c24d658ccc569994d62004afdebcaa90 Mon Sep 17 00:00:00 2001
From: Leijurv <leijurv@gmail.com>
Date: Sun, 20 Aug 2023 11:53:54 -0700
Subject: [PATCH] check chunk load in sepples

---
 build.gradle                                                  | 2 +-
 src/main/java/baritone/process/elytra/ElytraBehavior.java     | 3 ++-
 .../java/baritone/process/elytra/NetherPathfinderContext.java | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index b981972d3..75d17fb02 100755
--- a/build.gradle
+++ b/build.gradle
@@ -77,7 +77,7 @@ allprojects {
         // The following line declares the yarn mappings you may select this one as well.
         // mappings "net.fabricmc:yarn:1.17.1+build.32:v2"
         //launchImplementation('dev.babbaj:nether-pathfinder:1.3.0')
-        implementation 'dev.babbaj:nether-pathfinder:1.3.0'
+        implementation 'dev.babbaj:nether-pathfinder:1.4'
     }
 
     tasks.withType(JavaCompile).configureEach {
diff --git a/src/main/java/baritone/process/elytra/ElytraBehavior.java b/src/main/java/baritone/process/elytra/ElytraBehavior.java
index 127f90131..a0763095d 100644
--- a/src/main/java/baritone/process/elytra/ElytraBehavior.java
+++ b/src/main/java/baritone/process/elytra/ElytraBehavior.java
@@ -42,6 +42,7 @@ import net.minecraft.world.entity.projectile.FireworkRocketEntity;
 import net.minecraft.world.inventory.ClickType;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.level.chunk.ChunkSource;
 import net.minecraft.world.level.chunk.LevelChunk;
@@ -302,7 +303,7 @@ public final class ElytraBehavior implements Helper {
 
             int rangeStartIncl = playerNear;
             int rangeEndExcl = playerNear;
-            while (rangeEndExcl < path.size() && ctx.world().isLoaded(path.get(rangeEndExcl))) {
+            while (rangeEndExcl < path.size() && context.hasChunk(new ChunkPos(path.get(rangeEndExcl)))) {
                 rangeEndExcl++;
             }
             // rangeEndExcl now represents an index either not in the path, or just outside render distance
diff --git a/src/main/java/baritone/process/elytra/NetherPathfinderContext.java b/src/main/java/baritone/process/elytra/NetherPathfinderContext.java
index de666a0a8..aa9f4965a 100644
--- a/src/main/java/baritone/process/elytra/NetherPathfinderContext.java
+++ b/src/main/java/baritone/process/elytra/NetherPathfinderContext.java
@@ -60,6 +60,10 @@ public final class NetherPathfinderContext {
         this.executor = Executors.newSingleThreadExecutor();
     }
 
+    public boolean hasChunk(ChunkPos pos) {
+        return NetherPathfinder.hasChunkFromJava(this.context, pos.x, pos.z);
+    }
+
     public void queueCacheCulling(int chunkX, int chunkZ, int maxDistanceBlocks, BlockStateOctreeInterface boi) {
         this.executor.execute(() -> {
             synchronized (this.cullingLock) {