SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Added new bukkit.yml entry (settings -> world-container) to control the directory worlds are stored in

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Nathan Adams 2011-10-12 04:24:41 +01:00
Ursprung f4229fcadd
Commit 75d9b04deb
2 geänderte Dateien mit 7 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
src/main/java/net/minecraft/server/MinecraftServer.java
Datei anzeigen

@ -188,7 +188,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
WorldSettings settings = new WorldSettings(i, j, true); WorldSettings settings = new WorldSettings(i, j, true);
if (k == 0) { 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 { } else {
String dim = "DIM-1"; 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) { if (gen != null) {

6
src/main/java/org/bukkit/craftbukkit/CraftServer.java
Datei anzeigen

@ -509,7 +509,7 @@ public final class CraftServer implements Server {
} }
int dimension = 10 + console.worlds.size(); int dimension = 10 + console.worlds.size();
WorldServer internal = new WorldServer(console, new ServerNBTManager(new File("."), name, true), name, dimension, new WorldSettings(creator.seed(), getDefaultGameMode().getValue(), true), creator.environment(), generator); WorldServer internal = new WorldServer(console, new ServerNBTManager(getWorldContainer(), name, true), name, dimension, new WorldSettings(creator.seed(), getDefaultGameMode().getValue(), true), creator.environment(), generator);
if (!(worlds.containsKey(name.toLowerCase()))) { if (!(worlds.containsKey(name.toLowerCase()))) {
return null; return null;
@ -898,4 +898,8 @@ public final class CraftServer implements Server {
} }
} }
} }
public File getWorldContainer() {
return new File(configuration.getString("settings.world-container", "."));
}
} }