fix setup being set before engine setup

2026-06-18 23:01:07 +00:00 · 2024-02-12 11:42:47 +01:00
parent d658ec2099
commit 6a012cf400
1 changed files with 415 additions and 413 deletions
@@ -240,34 +240,36 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun

        lock.lock();

-        if (setup.get()) {
-            return getEngine();
-        }
-
-
-        setup.set(true);
-        getWorld().setRawWorldSeed(world.getSeed());
-        setupEngine();
-        this.hotloader = studio ? new Looper() {
-            @Override
-            protected long loop() {
-                if (hotloadChecker.flip()) {
-                    folder.check();
-                }
-
-                return 250;
+        try {
+            if (setup.get()) {
+                return getEngine();
            }
-        } : null;

-        if (studio) {
-            hotloader.setPriority(Thread.MIN_PRIORITY);
-            hotloader.start();
-            hotloader.setName(getTarget().getWorld().name() + " Hotloader");
+
+            getWorld().setRawWorldSeed(world.getSeed());
+            setupEngine();
+            setup.set(true);
+            this.hotloader = studio ? new Looper() {
+                @Override
+                protected long loop() {
+                    if (hotloadChecker.flip()) {
+                        folder.check();
+                    }
+
+                    return 250;
+                }
+            } : null;
+
+            if (studio) {
+                hotloader.setPriority(Thread.MIN_PRIORITY);
+                hotloader.start();
+                hotloader.setName(getTarget().getWorld().name() + " Hotloader");
+            }
+
+            return engine;
+        } finally {
+            lock.unlock();
        }
-
-        lock.unlock();
-
-        return engine;
    }

    @Override