fixes

Author: babbaj

src/main/java/baritone/process/ElytraProcess.java

@@ -44,6 +44,7 @@
 import baritone.utils.BaritoneProcessHelper;
 import baritone.utils.PathingCommandContext;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
+import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.entity.EquipmentSlot;
@@ -112,20 +113,25 @@ public void resetState() {
 
     @Override
     public PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel) {
-        final long seedSetting = Baritone.settings().elytraNetherSeed.value;
-        if (seedSetting != this.behavior.context.getSeed()) {
-            logDirect("Nether seed changed, recalculating path");
-            this.resetState();
-        }
-        if (predictingTerrain != Baritone.settings().elytraPredictTerrain.value && ctx.player().level.dimension() == Level.NETHER) {
-            logDirect("elytraPredictTerrain setting changed, recalculating path from scratch");
-            predictingTerrain = Baritone.settings().elytraPredictTerrain.value;
-            this.resetState();
-        }
-        if (allowTight != Baritone.settings().elytraAllowTightSpaces.value) {
-            logDirect("elytraAllowTightSpaces setting changed, recalculating path from scratch");
-            allowTight = Baritone.settings().elytraAllowTightSpaces.value;
-            this.resetState();
+        try {
+            final long seedSetting = Baritone.settings().elytraNetherSeed.value;
+            if (seedSetting != this.behavior.context.getSeed()) {
+                logDirect("Nether seed changed, recalculating path");
+                this.resetState();
+            }
+            if (predictingTerrain != Baritone.settings().elytraPredictTerrain.value && ctx.player().level.dimension() == Level.NETHER) {
+                logDirect("elytraPredictTerrain setting changed, recalculating path from scratch");
+                predictingTerrain = Baritone.settings().elytraPredictTerrain.value;
+                this.resetState();
+            }
+            if (allowTight != Baritone.settings().elytraAllowTightSpaces.value) {
+                logDirect("elytraAllowTightSpaces setting changed, recalculating path from scratch");
+                allowTight = Baritone.settings().elytraAllowTightSpaces.value;
+                this.resetState();
+            }
+        } catch (IllegalArgumentException e) {
+            logDirect(e.getMessage(), ChatFormatting.RED);
+            return new PathingCommand(null, PathingCommandType.CANCEL_AND_SET_GOAL);
         }
 
         this.behavior.onTick();

src/main/java/baritone/process/elytra/BlockStateOctreeInterface.java

@@ -28,21 +28,21 @@ public final class BlockStateOctreeInterface {
 
     private final NetherPathfinderContext context;
     private final long contextPtr;
-    private final DimensionType dimType;
+    private final int minY;
     transient long chunkPtr;
 
     // Guarantee that the first lookup will fetch the context by setting MAX_VALUE
     private int prevChunkX = Integer.MAX_VALUE;
     private int prevChunkZ = Integer.MAX_VALUE;
 
-    public BlockStateOctreeInterface(final NetherPathfinderContext context, final DimensionType dimType) {
+    public BlockStateOctreeInterface(final NetherPathfinderContext context) {
         this.context = context;
         this.contextPtr = context.context;
-        this.dimType = dimType;
+        this.minY = context.minY;
     }
 
     public boolean get0(final int x, final int y, final int z) {
-        final int adjustedY = y - dimType.minY();
+        final int adjustedY = y - this.minY;
         if (adjustedY < 0 || adjustedY > 383) {
             return false;
         }

src/main/java/baritone/process/elytra/ElytraBehavior.java

@@ -134,7 +134,7 @@ public ElytraBehavior(Baritone baritone, ElytraProcess process, BlockPos destina
                 Baritone.settings().elytraUseCache.value ? baritone.getWorldProvider().getCurrentWorld().directory.resolve("cache") : null,
                 ctx.world()
         );
-        this.boi = new BlockStateOctreeInterface(context, ctx.world().dimensionType());
+        this.boi = new BlockStateOctreeInterface(context);
     }
 
     public final class PathManager {
@@ -152,6 +152,7 @@ public PathManager() {
             this.clear();
         }
 
+        // requires read lock to be held
         public void tick() {
             // Recalculate closest path node
             this.updatePlayerNear();

src/main/java/baritone/process/elytra/NetherPathfinderContext.java

@@ -80,7 +80,7 @@ public final class NetherPathfinderContext {
     // operations that don't make changes to the chunk cache. could use multiple threads but i'm not sure if it would cause problems.
     private final ExecutorService readExecutor = Executors.newSingleThreadExecutor();
     private final ResourceKey<Level> dimension;
-    private final int minY;
+    final int minY;
 
     public NetherPathfinderContext(long seed, Path cache, Level world) {
         this.dimension = world.dimension();