mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-16 18:31:53 +01:00
Changes to reflect new Environment enum
By: Dinnerbone <dinnerbone@dinnerbone.com>
This commit is contained in:
parent
be3e8a666e
commit
defd90752e
2 changed files with 13 additions and 2 deletions
paper-server/src/main/java/org/bukkit/craftbukkit
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Reference in a new issue