summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-07-08 19:01:03 +0100
committerDinnerbone <dinnerbone@dinnerbone.com>2011-07-08 19:01:03 +0100
commitc56d0c0842923ac3b80d627790aa60d99e698dbf (patch)
treedfebee8d11a1053ea3f43c5bd3b5c096774fe2ca /src/main/java/org
parentdac47b01348d0cdef050f02a5a18388954af92ef (diff)
downloadcraftbukkit-c56d0c0842923ac3b80d627790aa60d99e698dbf.tar
craftbukkit-c56d0c0842923ac3b80d627790aa60d99e698dbf.tar.gz
craftbukkit-c56d0c0842923ac3b80d627790aa60d99e698dbf.tar.lz
craftbukkit-c56d0c0842923ac3b80d627790aa60d99e698dbf.tar.xz
craftbukkit-c56d0c0842923ac3b80d627790aa60d99e698dbf.zip
Use generators from bukkit.yml if none was specified at createWorld
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 59e4f85a..00101170 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -387,6 +387,10 @@ public final class CraftServer implements Server {
throw new IllegalArgumentException("File exists with the name '" + name + "' and isn't a folder");
}
+ if (generator == null) {
+ generator = getGenerator(name);
+ }
+
Convertable converter = new WorldLoaderServer(folder);
if (converter.isConvertable(name)) {
getLogger().info("Converting world '" + name + "'");