From f9cb107728ee5e8244b6cc4a370c8ed8d1708738 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Tue, 13 Aug 2024 20:25:34 +0200
Subject: [PATCH] catch getEngineData NullPointer

---
 core/src/main/java/com/volmit/iris/engine/IrisEngine.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
index e1ea0a00e..0499050d3 100644
--- a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
+++ b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
@@ -251,7 +251,7 @@ public class IrisEngine implements Engine {
 
     @Override
     public IrisEngineData getEngineData() {
-        return engineData.aquire(() -> {
+        var ret = engineData.aquire(() -> {
             //TODO: Method this file
             File f = new File(getWorld().worldFolder(), "iris/engine-data/" + getDimension().getLoadKey() + ".json");
 
@@ -279,6 +279,11 @@ public class IrisEngine implements Engine {
 
             return new IrisEngineData();
         });
+        if (ret == null) {
+            Iris.error("Failed to load Engine Data! (How did this happen?)");
+            return new IrisEngineData();
+        }
+        return ret;
     }
 
     @Override