diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java index 97ae262..5bafafb 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -45,6 +45,7 @@ import org.ultramine.server.UltramineServerConfig; import org.ultramine.server.UltramineServerConfig.VanillaConfig; import org.ultramine.server.WorldsConfig.WorldConfig; +import org.ultramine.server.util.BasicTypeParser; @SideOnly(Side.SERVER) public class DedicatedServer extends MinecraftServer implements IServer @@ -272,7 +273,7 @@ public EnumDifficulty func_147135_j() { - return EnumDifficulty.getDifficultyEnum(ConfigurationHandler.getWorldsConfig().global.settings.difficulty); + return BasicTypeParser.parseDifficulty(ConfigurationHandler.getWorldsConfig().global.settings.difficulty); } public boolean isHardcore() diff --git a/src/main/java/org/ultramine/server/MultiWorld.java b/src/main/java/org/ultramine/server/MultiWorld.java index c8acf3f..0a4d34d 100644 --- a/src/main/java/org/ultramine/server/MultiWorld.java +++ b/src/main/java/org/ultramine/server/MultiWorld.java @@ -189,7 +189,7 @@ if (!server.isSinglePlayer()) world.getWorldInfo().setGameType(server.getGameType()); - world.difficultySetting = EnumDifficulty.getDifficultyEnum(conf.settings.difficulty); + world.difficultySetting = BasicTypeParser.parseDifficulty(ConfigurationHandler.getWorldsConfig().global.settings.difficulty); world.setAllowedSpawnTypes(conf.mobSpawn.spawnMonsters, conf.mobSpawn.spawnAnimals); world.setConfig(conf); diff --git a/src/main/java/org/ultramine/server/WorldsConfig.java b/src/main/java/org/ultramine/server/WorldsConfig.java index 0ab10f1..26167ca 100644 --- a/src/main/java/org/ultramine/server/WorldsConfig.java +++ b/src/main/java/org/ultramine/server/WorldsConfig.java @@ -34,7 +34,7 @@ public static class Settings { - public int difficulty = 1; + public String difficulty = "1"; public boolean pvp = true; public int maxBuildHeight = 256; }