From 5f5567f283a0e51eb2b74b117abf448ce0f684e7 Mon Sep 17 00:00:00 2001
From: Babbaj <babbaj45@gmail.com>
Date: Sat, 19 Aug 2023 15:33:12 -0400
Subject: [PATCH] recover from flying into lava (and fix ignoreLava)

---
 .../java/baritone/process/elytra/ElytraBehavior.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/baritone/process/elytra/ElytraBehavior.java b/src/main/java/baritone/process/elytra/ElytraBehavior.java
index 127f90131..7334f10b4 100644
--- a/src/main/java/baritone/process/elytra/ElytraBehavior.java
+++ b/src/main/java/baritone/process/elytra/ElytraBehavior.java
@@ -24,6 +24,7 @@ import baritone.api.behavior.look.ITickableAimProcessor;
 import baritone.api.event.events.*;
 import baritone.api.pathing.goals.GoalBlock;
 import baritone.api.utils.*;
+import baritone.api.utils.input.Input;
 import baritone.process.ElytraProcess;
 import baritone.utils.BlockStateInterface;
 import baritone.utils.IRenderer;
@@ -601,6 +602,11 @@ public final class ElytraBehavior implements Helper {
             this.deployedFireworkLastTick = false;
         }
 
+        final boolean inLava = ctx.player().isInLava();
+        if (inLava) {
+            baritone.getInputOverrideHandler().setInputForceState(Input.JUMP, true);
+        }
+
         if (solution == null) {
             logDirect("no solution");
             return;
@@ -619,7 +625,7 @@ public final class ElytraBehavior implements Helper {
                 solution.context.start,
                 solution.goingTo,
                 solution.context.boost.isBoosted(),
-                solution.forceUseFirework
+                solution.forceUseFirework || inLava
         );
     }
 
@@ -1001,7 +1007,7 @@ public final class ElytraBehavior implements Helper {
             // if start == dest then the cpp raytracer dies
             clear = start.equals(dest) || this.context.raytrace(start, dest);
         } else {
-            clear = ctx.world().clip(new ClipContext(start, dest, ClipContext.Block.COLLIDER, ClipContext.Fluid.ANY, ctx.player())).getType() == HitResult.Type.MISS;
+            clear = ctx.world().clip(new ClipContext(start, dest, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, ctx.player())).getType() == HitResult.Type.MISS;
         }
 
         if (Baritone.settings().elytraRenderRaytraces.value) {