From d42bfcfa53fc4d27f46cae301b35a7d6f97c0612 Mon Sep 17 00:00:00 2001
From: Brady <zeromemesdev@gmail.com>
Date: Tue, 20 Jun 2023 23:15:45 -0500
Subject: [PATCH] Fix NPE

---
 src/main/java/baritone/behavior/ElytraBehavior.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/baritone/behavior/ElytraBehavior.java b/src/main/java/baritone/behavior/ElytraBehavior.java
index eb6e2c4b0..5f3e92838 100644
--- a/src/main/java/baritone/behavior/ElytraBehavior.java
+++ b/src/main/java/baritone/behavior/ElytraBehavior.java
@@ -333,8 +333,10 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
         this.aimPos = null;
         this.remainingFireworkTicks = 0;
         this.remainingSetBackTicks = 0;
-        this.solver.cancel(true);
-        this.solver = null;
+        if (this.solver != null) {
+            this.solver.cancel(true);
+            this.solver = null;
+        }
     }
 
     @Override