From 11b388ff39abaead7bf0349b99c12a2fbb236a86 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Mon, 3 Oct 2011 10:08:38 -0400 Subject: [PATCH] Fixed multiworld difficulty. World difficulty was incorrectly being set to 0 or 1 on reload depending on spawn-monsters instead of the difficulty server property. --- src/main/java/org/bukkit/craftbukkit/CraftServer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 2035ace4b7..400c5b4562 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -372,6 +372,7 @@ public final class CraftServer implements Server { boolean animals = config.getBoolean("spawn-animals", console.spawnAnimals); boolean monsters = config.getBoolean("spawn-monsters", console.worlds.get(0).difficulty > 0); + int difficulty = config.getInt("difficulty", console.worlds.get(0).difficulty); console.onlineMode = config.getBoolean("online-mode", console.onlineMode); console.spawnAnimals = config.getBoolean("spawn-animals", console.spawnAnimals); @@ -379,7 +380,7 @@ public final class CraftServer implements Server { console.allowFlight = config.getBoolean("allow-flight", console.allowFlight); for (WorldServer world : console.worlds) { - world.difficulty = monsters ? 1 : 0; + world.difficulty = difficulty; world.setSpawnFlags(monsters, animals); }