summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorTheCutter <info@thecutter.net>2014-12-05 19:55:52 +0100
committermd_5 <git@md-5.net>2014-12-12 11:00:41 +1100
commitfe8d20e376f1f343d9d1c95f02857b8d1641c0a5 (patch)
tree8310facc2f54738d045b1936bbbb3eb804565392 /src/main
parent9fa497cd5568f2c232ef19f6c085dcca1a971ce0 (diff)
downloadcraftbukkit-fe8d20e376f1f343d9d1c95f02857b8d1641c0a5.tar
craftbukkit-fe8d20e376f1f343d9d1c95f02857b8d1641c0a5.tar.gz
craftbukkit-fe8d20e376f1f343d9d1c95f02857b8d1641c0a5.tar.lz
craftbukkit-fe8d20e376f1f343d9d1c95f02857b8d1641c0a5.tar.xz
craftbukkit-fe8d20e376f1f343d9d1c95f02857b8d1641c0a5.zip
using generator settings from WorldCreator to specify presets for FLAT or CUSTOMIZED world types
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5582e0b2..b4ad7d1e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -848,7 +848,9 @@ public final class CraftServer implements Server {
IDataManager sdm = new ServerNBTManager(getWorldContainer(), name, true);
WorldData worlddata = sdm.getWorldData();
if (worlddata == null) {
- worlddata = new WorldData(new WorldSettings(creator.seed(), EnumGamemode.getById(getDefaultGameMode().getValue()), generateStructures, hardcore, type), name);
+ WorldSettings worldSettings = new WorldSettings(creator.seed(), EnumGamemode.getById(getDefaultGameMode().getValue()), generateStructures, hardcore, type);
+ worldSettings.setGeneratorSettings(creator.generatorSettings());
+ worlddata = new WorldData(worldSettings, name);
}
worlddata.checkName(name); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end)
WorldServer internal = (WorldServer) new WorldServer(console, sdm, worlddata, dimension, console.methodProfiler, creator.environment(), generator).b();