From 5180d1a17a42a3bfc64b3af26c6e6bb77d6bc73c Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Thu, 11 Feb 2021 11:21:14 +0100 Subject: [PATCH] Clean up environment getting --- .../iris/scaffold/IrisWorldCreator.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/volmit/iris/scaffold/IrisWorldCreator.java b/src/main/java/com/volmit/iris/scaffold/IrisWorldCreator.java index 0586ed35c..aac7f1566 100644 --- a/src/main/java/com/volmit/iris/scaffold/IrisWorldCreator.java +++ b/src/main/java/com/volmit/iris/scaffold/IrisWorldCreator.java @@ -4,6 +4,7 @@ import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.object.IrisDimension; import com.volmit.iris.scaffold.engine.EngineCompositeGenerator; import org.bukkit.World; +import org.bukkit.World.Environment; import org.bukkit.WorldCreator; import org.bukkit.generator.ChunkGenerator; @@ -66,26 +67,14 @@ public class IrisWorldCreator } private World.Environment findEnvironment() { - if(dimensionName == null) + IrisDimension dim = IrisDataManager.loadAnyDimension(dimensionName); + if(dim == null || dim.getEnvironment() == null) { return World.Environment.NORMAL; } - else if(dimensionName == "NETHER") - { - return World.Environment.NETHER; - } - else if(dimensionName == "END") - { - return World.Environment.THE_END; - } - - IrisDimension dim = IrisDataManager.loadAnyDimension(dimensionName); - - if(dim != null) + else { return dim.getEnvironment(); } - - return World.Environment.NORMAL; } }