diff --git a/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java b/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java index 0c935535c..b7949fe40 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java @@ -18,6 +18,7 @@ package com.volmit.iris.core.pregenerator.methods; +import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.pregenerator.PregeneratorMethod; @@ -48,6 +49,12 @@ public class AsyncPregenMethod implements PregeneratorMethod { private void unloadAndSaveAllChunks() { try { J.sfut(() -> { + if(world == null) + { + Iris.warn("World was null somehow..."); + return; + } + for (Chunk i : world.getLoadedChunks()) { i.unload(true); } diff --git a/src/main/java/com/volmit/iris/util/scheduling/J.java b/src/main/java/com/volmit/iris/util/scheduling/J.java index 91ebe829c..c5f92b508 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/J.java +++ b/src/main/java/com/volmit/iris/util/scheduling/J.java @@ -256,7 +256,15 @@ public class J { * @param delay the delay to wait in ticks before running */ public static void s(Runnable r, int delay) { - Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, r, delay); + try + { + Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, r, delay); + } + + catch(Throwable e) + { + Iris.reportError(e); + } } /**