From bf91156182039e57b8b8e54dac9ef5105a0d3d11 Mon Sep 17 00:00:00 2001
From: DanLT <danielmillst@gmail.com>
Date: Wed, 23 Jun 2021 21:14:29 -0800
Subject: [PATCH] Iris Create / Project Load/Create skipLoadSpawn

---
 src/main/java/com/volmit/iris/manager/IrisProject.java       | 4 +++-
 .../volmit/iris/manager/command/world/CommandIrisCreate.java | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/volmit/iris/manager/IrisProject.java b/src/main/java/com/volmit/iris/manager/IrisProject.java
index 7c887f429..4b7d5b813 100644
--- a/src/main/java/com/volmit/iris/manager/IrisProject.java
+++ b/src/main/java/com/volmit/iris/manager/IrisProject.java
@@ -3,6 +3,7 @@ package com.volmit.iris.manager;
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
+import com.volmit.iris.nms.INMS;
 import com.volmit.iris.object.*;
 import com.volmit.iris.scaffold.IrisWorldCreator;
 import com.volmit.iris.scaffold.engine.IrisAccess;
@@ -14,6 +15,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
+import org.bukkit.craftbukkit.v1_17_R1.CraftServer;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.zeroturnaround.zip.ZipUtil;
@@ -190,7 +192,7 @@ public class IrisProject
 		});
 
 		//@builder
-		World world = c.createWorld();
+		World world = INMS.get().createWorld(c);
 		Iris.linkMultiverseCore.removeFromConfig(world);
 
 		done.set(true);
diff --git a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java
index d77615fb8..d4bf11fbb 100644
--- a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java
+++ b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java
@@ -4,6 +4,7 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.manager.link.MultiverseCoreLink;
+import com.volmit.iris.nms.INMS;
 import com.volmit.iris.object.IrisDimension;
 import com.volmit.iris.pregen.Pregenerator;
 import com.volmit.iris.scaffold.IrisWorldCreator;
@@ -161,7 +162,7 @@ public class CommandIrisCreate extends MortarCommand
 
 			dim = Iris.proj.installIntoWorld(sender, type, folder);
 
-			WorldCreator wc = new IrisWorldCreator().dimension(dim).name(worldName)
+			WorldCreator wc = new IrisWorldCreator().dimension(dim.getLoadKey()).name(worldName)
 					.productionMode().seed(seed).create();
 
 			J.s(() -> {
@@ -194,7 +195,7 @@ public class CommandIrisCreate extends MortarCommand
 					}
 				});
 
-				world.set(wc.createWorld());
+				world.set(INMS.get().createWorld(wc));
 
 				done.set(true);
 			});