update layeredScreen

TeamJM · Sep 4, 2024 · 09feb88 · 09feb88
1 parent f9be673
commit 09feb88
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/common/src/main/java/journeymap/api/v2/client/ui/component/LayeredScreen.java b/common/src/main/java/journeymap/api/v2/client/ui/component/LayeredScreen.java
@@ -7,7 +7,6 @@
 
 public abstract class LayeredScreen extends Screen
 {
-
     protected Minecraft minecraft;
     protected Screen backgroundScreen;
 
@@ -19,7 +18,10 @@ protected LayeredScreen(Component component)
 
     public void display()
     {
-        this.backgroundScreen = this.minecraft.screen;
+        if (this.minecraft.screen != null)
+        {
+            this.backgroundScreen = this.minecraft.screen;
+        }
         this.minecraft.setScreen(this);
     }
 
@@ -76,7 +78,14 @@ public void popLayer()
         {
             this.minecraft.screen.removed();
         }
-        this.minecraft.screen = this.backgroundScreen;
+        if (this.backgroundScreen != null)
+        {
+            this.minecraft.screen = this.backgroundScreen;
+        }
+        else
+        {
+            this.minecraft.setScreen(null);
+        }
     }
 
     public Screen getBackgroundScreen()