Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-28 05:25:42 +01:00
Code Issues Projects Releases Wiki Activity

Fixed multiworld difficulty.

Browse Source 
World difficulty was incorrectly being set to 0 or 1 on reload depending
on spawn-monsters instead of the difficulty server property.
This commit is contained in:
EvilSeph 2011-10-03 10:08:38 -04:00
parent 7c5007c016
commit 11b388ff39
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -372,6 +372,7 @@ public final class CraftServer implements Server {
boolean animals = config.getBoolean("spawn-animals", console.spawnAnimals); boolean animals = config.getBoolean("spawn-animals", console.spawnAnimals);
boolean monsters = config.getBoolean("spawn-monsters", console.worlds.get(0).difficulty > 0); 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.onlineMode = config.getBoolean("online-mode", console.onlineMode);
console.spawnAnimals = config.getBoolean("spawn-animals", console.spawnAnimals); 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); console.allowFlight = config.getBoolean("allow-flight", console.allowFlight);
for (WorldServer world : console.worlds) { for (WorldServer world : console.worlds) {
world.difficulty = monsters ? 1 : 0; world.difficulty = difficulty;
world.setSpawnFlags(monsters, animals); world.setSpawnFlags(monsters, animals);
} }