summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server
diff options
context:
space:
mode:
authorNathan Adams <dinnerbone@dinnerbone.com>2011-10-12 04:24:41 +0100
committerNathan Adams <dinnerbone@dinnerbone.com>2011-10-12 04:25:03 +0100
commit75d9b04deb799589784c79d6fe3e690121b79473 (patch)
treea1b2ee2fdbc79fa0c4f463f3596934dadd247f3f /src/main/java/net/minecraft/server
parentf4229fcaddaa2efb5402ebf9c2647ba783c2f26c (diff)
downloadcraftbukkit-75d9b04deb799589784c79d6fe3e690121b79473.tar
craftbukkit-75d9b04deb799589784c79d6fe3e690121b79473.tar.gz
craftbukkit-75d9b04deb799589784c79d6fe3e690121b79473.tar.lz
craftbukkit-75d9b04deb799589784c79d6fe3e690121b79473.tar.xz
craftbukkit-75d9b04deb799589784c79d6fe3e690121b79473.zip
Added new bukkit.yml entry (settings -> world-container) to control the directory worlds are stored in
Diffstat (limited to 'src/main/java/net/minecraft/server')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 58e03167..347262e8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -188,7 +188,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
WorldSettings settings = new WorldSettings(i, j, true);
if (k == 0) {
- world = new WorldServer(this, new ServerNBTManager(new File("."), s, true), s, dimension, settings, org.bukkit.World.Environment.getEnvironment(dimension), gen); // CraftBukkit
+ world = new WorldServer(this, new ServerNBTManager(server.getWorldContainer(), s, true), s, dimension, settings, org.bukkit.World.Environment.getEnvironment(dimension), gen); // CraftBukkit
} else {
String dim = "DIM-1";
@@ -218,7 +218,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
}
}
- world = new SecondaryWorldServer(this, new ServerNBTManager(new File("."), name, true), name, dimension, settings, this.worlds.get(0), org.bukkit.World.Environment.getEnvironment(dimension), gen); // CraftBukkit
+ world = new SecondaryWorldServer(this, new ServerNBTManager(server.getWorldContainer(), name, true), name, dimension, settings, this.worlds.get(0), org.bukkit.World.Environment.getEnvironment(dimension), gen); // CraftBukkit
}
if (gen != null) {