From c65c197fbe40a1cf7fe49179bd55e0d171a167b0 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Tue, 27 Oct 2020 05:55:25 -0400 Subject: [PATCH] Fixes --- src/main/java/com/volmit/iris/Iris.java | 2 ++ .../java/com/volmit/iris/gen/nms/v16_2/NMSCreator16_2.java | 2 +- src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/Hunk.java | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index ccf4046c2..8c4ba897d 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -11,6 +11,7 @@ import org.bukkit.World; import org.bukkit.World.Environment; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; +import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; import org.bukkit.event.HandlerList; import org.bukkit.generator.ChunkGenerator; import org.bukkit.plugin.Plugin; @@ -53,6 +54,7 @@ import com.volmit.iris.util.RNG; import com.volmit.iris.util.ShurikenQueue; import io.papermc.lib.PaperLib; +import net.minecraft.server.v1_16_R2.WorldServer; public class Iris extends MortarPlugin { diff --git a/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSCreator16_2.java b/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSCreator16_2.java index 5f3f24bec..cbe9bb4ba 100644 --- a/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSCreator16_2.java +++ b/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSCreator16_2.java @@ -86,7 +86,7 @@ class NMSCreator16_2 implements INMSCreator org.bukkit.generator.ChunkGenerator generator = creator.generator(); final File folder = new File(server.getWorldContainer(), name); final World world = server.getWorld(name); - + if(world != null) { return world; diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/Hunk.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/Hunk.java index a1932efa3..78e64dd82 100644 --- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/Hunk.java +++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/Hunk.java @@ -182,7 +182,7 @@ public interface Hunk { return false; } - + default Hunk invertY() { return new InvertedHunkView(this); @@ -588,7 +588,7 @@ public interface Hunk getSections2D(parallelism, (xx, yy, zz, h, r) -> e.queue(() -> { v.accept(xx, yy, zz, h); - + synchronized(rq) { rq.add(r);