From defd90752ef4d1d2f10a7bc5aa11e6e58f271e61 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Sun, 6 Feb 2011 20:50:57 +0000 Subject: [PATCH] Changes to reflect new Environment enum By: Dinnerbone --- .../main/java/org/bukkit/craftbukkit/CraftServer.java | 4 ++-- .../main/java/org/bukkit/craftbukkit/CraftWorld.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 4bc774071b..c84c5da0f1 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -192,14 +192,14 @@ public final class CraftServer implements Server { return "CraftServer{" + "serverName=" + serverName + "serverVersion=" + serverVersion + "protocolVersion=" + protocolVersion + '}'; } - public World createWorld(String name, boolean nether) { + public World createWorld(String name, World.Environment environment) { File folder = new File(name); if ((folder.exists()) && (!folder.isDirectory())) { throw new IllegalArgumentException("File exists with the name '" + name + "' and isn't a folder"); } - WorldServer internal = new WorldServer(console, new File("."), name, nether ? -1 : 0); + WorldServer internal = new WorldServer(console, new File("."), name, environment == World.Environment.NETHER ? -1 : 0); internal.a(new WorldManager(console, internal)); internal.k = 1; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 6f4e49bcdf..3ff5c7d6b6 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -24,11 +24,18 @@ import org.bukkit.World; public class CraftWorld implements World { private final WorldServer world; + private final Environment environment; private static final Random rand = new Random(); public CraftWorld(WorldServer world) { this.world = world; + + if (world.q instanceof WorldProviderHell) { + environment = Environment.NETHER; + } else { + environment = Environment.NORMAL; + } } public Block getBlockAt(int x, int y, int z) { @@ -212,6 +219,10 @@ public class CraftWorld implements World { world.e = time; } + public Environment getEnvironment() { + return environment; + } + private final class ChunkCoordinate { public final int x; public final int z;