13
0
geforkt von Mirrors/Paper

Changes to reflect new Environment enum

By: Dinnerbone <dinnerbone@dinnerbone.com>
Dieser Commit ist enthalten in:
CraftBukkit/Spigot 2011-02-06 20:50:57 +00:00
Ursprung be3e8a666e
Commit defd90752e
2 geänderte Dateien mit 13 neuen und 2 gelöschten Zeilen

Datei anzeigen

@ -192,14 +192,14 @@ public final class CraftServer implements Server {
return "CraftServer{" + "serverName=" + serverName + "serverVersion=" + serverVersion + "protocolVersion=" + protocolVersion + '}'; 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); File folder = new File(name);
if ((folder.exists()) && (!folder.isDirectory())) { if ((folder.exists()) && (!folder.isDirectory())) {
throw new IllegalArgumentException("File exists with the name '" + name + "' and isn't a folder"); 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.a(new WorldManager(console, internal));
internal.k = 1; internal.k = 1;

Datei anzeigen

@ -24,11 +24,18 @@ import org.bukkit.World;
public class CraftWorld implements World { public class CraftWorld implements World {
private final WorldServer world; private final WorldServer world;
private final Environment environment;
private static final Random rand = new Random(); private static final Random rand = new Random();
public CraftWorld(WorldServer world) { public CraftWorld(WorldServer world) {
this.world = 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) { public Block getBlockAt(int x, int y, int z) {
@ -212,6 +219,10 @@ public class CraftWorld implements World {
world.e = time; world.e = time;
} }
public Environment getEnvironment() {
return environment;
}
private final class ChunkCoordinate { private final class ChunkCoordinate {
public final int x; public final int x;
public final int z; public final int z;