From aae47e103b81b63fe7be00c08366356a9ab495db Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sun, 18 Jul 2021 18:44:52 -0400 Subject: [PATCH] Spawn loc headless --- .../studio/CommandIrisStudioExplorerGenerator.java | 2 +- .../volmit/iris/engine/object/common/IrisWorld.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java index 7fe029d98..4f496636d 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java @@ -63,7 +63,7 @@ public class CommandIrisStudioExplorerGenerator extends MortarCommand { if (Iris.proj.isProjectOpen()) { generator = Iris.proj.getActiveProject().getActiveProvider().getData().getGeneratorLoader().load(args[0]); - seed = Iris.proj.getActiveProject().getActiveProvider().getTarget().getWorld().getSeed(); + seed = Iris.proj.getActiveProject().getActiveProvider().getTarget().getWorld().seed(); } else { generator = IrisDataManager.loadAnyGenerator(args[0]); } diff --git a/src/main/java/com/volmit/iris/engine/object/common/IrisWorld.java b/src/main/java/com/volmit/iris/engine/object/common/IrisWorld.java index 53c785d0e..000c5c25b 100644 --- a/src/main/java/com/volmit/iris/engine/object/common/IrisWorld.java +++ b/src/main/java/com/volmit/iris/engine/object/common/IrisWorld.java @@ -18,11 +18,13 @@ package com.volmit.iris.engine.object.common; +import com.volmit.iris.Iris; import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.util.collection.KList; import lombok.Builder; import lombok.Data; import lombok.experimental.Accessors; +import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; @@ -82,4 +84,14 @@ public class IrisWorld { public void bind(World world) { bindWorld(this, world); } + + public Location getSpawnLocation() { + if(hasRealWorld()) + { + return realWorld().getSpawnLocation(); + } + + Iris.error("This world is not real yet, cannot get spawn location! HEADLESS!"); + return null; + } }