From 3a419481ea87eaebc99cb853fca9d128dfb518c9 Mon Sep 17 00:00:00 2001 From: Eric Stokes Date: Sun, 29 Jan 2012 10:40:45 -0700 Subject: Added 'generate-structure' setting support and WorldCreator property. Fixes BUKKIT-655 and BUKKIT-592 --- src/main/java/org/bukkit/craftbukkit/CraftServer.java | 4 +++- src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/main/java/org/bukkit') diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index a7e98d74..07ab830f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -521,6 +521,7 @@ public final class CraftServer implements Server { File folder = new File(getWorldContainer(), name); World world = getWorld(name); WorldType type = WorldType.a(creator.type().getName()); + boolean generateStructures = creator.generateStructures(); if (world != null) { return world; @@ -552,7 +553,8 @@ public final class CraftServer implements Server { } } while(used); boolean hardcore = false; - WorldServer internal = new WorldServer(console, new ServerNBTManager(getWorldContainer(), name, true), name, dimension, new WorldSettings(creator.seed(), getDefaultGameMode().getValue(), true, hardcore, type), creator.environment(), generator); + + WorldServer internal = new WorldServer(console, new ServerNBTManager(getWorldContainer(), name, true), name, dimension, new WorldSettings(creator.seed(), getDefaultGameMode().getValue(), generateStructures, hardcore, type), creator.environment(), generator); if (!(worlds.containsKey(name.toLowerCase()))) { return null; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 969e25e9..5962004b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -978,4 +978,8 @@ public class CraftWorld implements World { public org.bukkit.WorldType getWorldType() { return org.bukkit.WorldType.getByName(world.getWorldData().getType().name()); } + + public boolean canGenerateStructures() { + return world.getWorldData().o(); + } } -- cgit v1.2.3