From 668d29a9d796847f30ec8efb8d032f23d50c0d38 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sat, 31 Jul 2021 22:44:46 -0400 Subject: [PATCH] Hotloader improvements --- .../java/com/volmit/iris/engine/IrisWorldManager.java | 2 +- .../iris/engine/framework/EngineCompositeGenerator.java | 8 +++++++- 2 files changed, 8 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 f6784e434..0e3281aed 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java @@ -59,7 +59,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { super(engine); spawnCooldowns = new KMap<>(); spawnable = true; - art = J.ar(this::onAsyncTick, 20); + art = J.ar(this::onAsyncTick, 7); } private void onAsyncTick() { 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 a3af5769b..5ae8adaa5 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java @@ -87,6 +87,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce private double generatedPerSecond = 0; private final int art; private ReactiveFolder hotloader = null; + private IrisWorld cworld = null; public EngineCompositeGenerator() { this(null, true); @@ -131,6 +132,11 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce getComposite().close(); initialized.lazySet(false); + + if(cworld != null) + { + initialize(cworld); + } } } @@ -315,7 +321,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce populators.clear(); populators.addAll(compound.get().getPopulators()); hotloader = new ReactiveFolder(data.getDataFolder(), (a, c, d) -> hotload()); - + cworld = world; // if(world.hasRealWorld()) // { // placeStrongholds(world.realWorld());