From 8471f15bc87aa74ef44265fd51881105b4821111 Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Sun, 27 Jul 2025 23:23:04 +0200 Subject: [PATCH] make world creation more failsafe --- core/src/main/java/com/volmit/iris/Iris.java | 21 ++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/volmit/iris/Iris.java b/core/src/main/java/com/volmit/iris/Iris.java index 4bd6c7ffc..194abbab4 100644 --- a/core/src/main/java/com/volmit/iris/Iris.java +++ b/core/src/main/java/com/volmit/iris/Iris.java @@ -501,12 +501,21 @@ public class Iris extends VolmitPlugin implements Listener { Iris.info("Loading World: %s | Generator: %s", s, generator); - Iris.info(C.LIGHT_PURPLE + "Preparing Spawn for " + s + "' using Iris:" + generator + "..."); - WorldCreator c = new WorldCreator(s) - .generator(getDefaultWorldGenerator(s, generator)) - .environment(IrisData.loadAnyDimension(generator).getEnvironment()); - INMS.get().createWorld(c); - Iris.info(C.LIGHT_PURPLE + "Loaded " + s + "!"); + try { + var gen = getDefaultWorldGenerator(s, generator); + var dim = loadDimension(s, generator); + assert dim != null && gen != null; + + Iris.info(C.LIGHT_PURPLE + "Preparing Spawn for " + s + "' using Iris:" + generator + "..."); + WorldCreator c = new WorldCreator(s) + .generator(gen) + .environment(dim.getEnvironment()); + INMS.get().createWorld(c); + Iris.info(C.LIGHT_PURPLE + "Loaded " + s + "!"); + } catch (Throwable e) { + Iris.error("Failed to load world " + s + "!"); + e.printStackTrace(); + } } } catch (Throwable e) { e.printStackTrace();