workaround some scuff

cabaletta · Mar 13, 2019 · a75317c · a75317c
1 parent ee6df27
commit a75317c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/src/api/java/baritone/api/process/IBaritoneProcess.java b/src/api/java/baritone/api/process/IBaritoneProcess.java
@@ -101,5 +101,14 @@ default double priority() {
      *
      * @return A display name that's suitable for a HUD
      */
-    String displayName();
+    default String displayName() {
+        if (!isActive()) {
+            // i love it when impcat's scuffed HUD calls displayName for inactive processes for 1 tick too long
+            // causing NPEs when the displayname relies on fields that become null when inactive
+            return "INACTIVE";
+        }
+        return displayName0();
+    }
+
+    String displayName0();
 }
diff --git a/src/main/java/baritone/process/BuilderProcess.java b/src/main/java/baritone/process/BuilderProcess.java
@@ -543,7 +543,7 @@ public void onLostControl() {
     }
 
     @Override
-    public String displayName() {
+    public String displayName0() {
         return "Building " + name;
     }
 

diff --git a/src/main/java/baritone/process/CustomGoalProcess.java b/src/main/java/baritone/process/CustomGoalProcess.java
@@ -105,7 +105,7 @@ public void onLostControl() {
     }
 
     @Override
-    public String displayName() {
+    public String displayName0() {
         return "Custom Goal " + this.goal;
     }
 

diff --git a/src/main/java/baritone/process/ExploreProcess.java b/src/main/java/baritone/process/ExploreProcess.java
@@ -94,7 +94,7 @@ public void onLostControl() {
     }
 
     @Override
-    public String displayName() {
+    public String displayName0() {
         return "Exploring around " + explorationOrigin + ", currently going to " + closestUncachedChunk(explorationOrigin);
     }
 }
diff --git a/src/main/java/baritone/process/FollowProcess.java b/src/main/java/baritone/process/FollowProcess.java
@@ -101,7 +101,7 @@ public void onLostControl() {
     }
 
     @Override
-    public String displayName() {
+    public String displayName0() {
         return "Follow " + cache;
     }
 

diff --git a/src/main/java/baritone/process/GetToBlockProcess.java b/src/main/java/baritone/process/GetToBlockProcess.java
@@ -160,11 +160,11 @@ public synchronized void onLostControl() {
     }
 
     @Override
-    public String displayName() {
+    public String displayName0() {
         if (knownLocations.isEmpty()) {
             return "Exploring randomly to find " + gettingTo + ", no known locations";
         }
-        return "Get To Block " + gettingTo + ", " + knownLocations.size() + " known locations";
+        return "Get To " + gettingTo + ", " + knownLocations.size() + " known locations";
     }
 
     private synchronized void rescan(List<BlockPos> known, CalculationContext context) {

diff --git a/src/main/java/baritone/process/MineProcess.java b/src/main/java/baritone/process/MineProcess.java
@@ -117,7 +117,7 @@ public void onLostControl() {
     }
 
     @Override
-    public String displayName() {
+    public String displayName0() {
         return "Mine " + mining;
     }