From 0a78a87a170b05e26e112ee382dbc6d7b0c88ab7 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 21 Jul 2021 08:37:26 -0400 Subject: [PATCH] Stop recreating threads without shutting down engine targets --- src/main/java/com/volmit/iris/engine/IrisEngine.java | 5 +++++ src/main/java/com/volmit/iris/engine/framework/Engine.java | 2 ++ .../iris/engine/framework/EngineCompositeGenerator.java | 2 ++ 3 files changed, 9 insertions(+) diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index d52619f40..f495cf5e7 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -212,6 +212,11 @@ public class IrisEngine extends BlockPopulator implements Engine { return getData().getBiomeLoader().load(getDimension().getFocus()); } + @Override + public void hotloading() { + close(); + } + @Override public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk c) { getWorldManager().spawnInitialEntities(c); diff --git a/src/main/java/com/volmit/iris/engine/framework/Engine.java b/src/main/java/com/volmit/iris/engine/framework/Engine.java index ae77163b0..6f3a00435 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -378,4 +378,6 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro } IrisBiome getFocus(); + + void hotloading(); } diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java index b7c21ff6e..9d5d97754 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java @@ -127,6 +127,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce } }); + + getComposite().close(); initialized.lazySet(false); } }