From 537b0f8dd68dbad19166ead2a1ddc9638a5d9140 Mon Sep 17 00:00:00 2001
From: RePixelatedMC <Repixelatedmc@gmail.com>
Date: Mon, 28 Oct 2024 15:44:44 +0100
Subject: [PATCH] Should work

---
 .../main/java/com/volmit/iris/engine/IrisEngine.java   |  2 ++
 .../java/com/volmit/iris/engine/object/IrisMerger.java | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
index a781fb1ba..9280c0511 100644
--- a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
+++ b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
@@ -203,6 +203,8 @@ public class IrisEngine implements Engine {
 
     private void updateMemoryWorld() {
         try {
+            if(!merger.isUseGenerator() || merger.getGenerator().isEmpty())
+                return;
             merger = getDimension().getMerger();
             if (!getDimension().isEnableExperimentalMerger()) return;
             if (getMerger().getGenerator().isBlank()) return;
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisMerger.java b/core/src/main/java/com/volmit/iris/engine/object/IrisMerger.java
index 26484f69c..396a29699 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisMerger.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisMerger.java
@@ -47,6 +47,9 @@ public class IrisMerger {
     @Desc("Selected Generator")
     private String generator;
 
+    @Desc("Use Generator")
+    private boolean useGenerator = false;
+
     @Desc("Uses a world instead of a generator")
     private String world;
 
@@ -85,10 +88,9 @@ public class IrisMerger {
             World bukkit;
 
             if (world.isBlank()) {
-                throw new UnsupportedOperationException("No.");
-                // memoryWorld = engine.getMemoryWorld();
-                // bukkit = memoryWorld.getBukkit();
-                // chunkData = memoryWorld.getChunkData(x, z);
+                //throw new UnsupportedOperationException("No.");
+                memoryWorld = engine.getMemoryWorld();
+                bukkit = memoryWorld.getBukkit();
             } else {
                 bukkit = Bukkit.getWorld(world);
                 if (bukkit == null) {