From 7f6fec5530085c35f12072742e60375e4d961f20 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sun, 8 Aug 2021 01:12:16 -0400 Subject: [PATCH] Fixes --- .../volmit/iris/engine/IrisWorldManager.java | 20 ++++++++++++++++++- .../iris/engine/object/noise/NoiseStyle.java | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java index a0ee4debf..6258067af 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java @@ -87,6 +87,11 @@ public class IrisWorldManager extends EngineAssignedWorldManager { looper = new Looper() { @Override protected long loop() { + if(getEngine().isClosed()) + { + interrupt(); + } + if(getDimension().isInfiniteEnergy()) { energy += 1000; @@ -133,6 +138,11 @@ public class IrisWorldManager extends EngineAssignedWorldManager { } private boolean onAsyncTick() { + if(getEngine().isClosed()) + { + return false; + } + actuallySpawned = 0; if (energy < 100) { @@ -154,7 +164,15 @@ public class IrisWorldManager extends EngineAssignedWorldManager { } if (cl.flip()) { - J.s(() -> precount = getEngine().getWorld().realWorld().getEntities()); + try + { + J.s(() -> precount = getEngine().getWorld().realWorld().getEntities()); + } + + catch(Throwable e) + { + close(); + } } int chunkCooldownSeconds = 60; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/NoiseStyle.java b/src/main/java/com/volmit/iris/engine/object/noise/NoiseStyle.java index 7eebe66c6..5d6412fdc 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/NoiseStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/noise/NoiseStyle.java @@ -45,7 +45,7 @@ public enum NoiseStyle { @Desc("Clover Noise") CLOVER(rng -> new CNG(rng, NoiseType.CLOVER, 1D, 1).scale(0.06).bake()), - + @Desc("CLOVER noise creates the same noise level for cells, changes noise level on cell borders.") CLOVER_STARCAST_3(rng -> new CNG(rng, NoiseType.CLOVER_STARCAST_3, 1D, 1)),