From 618986e216a837269c5ee5fb13269785b5711535 Mon Sep 17 00:00:00 2001
From: Jeremy Wood <farachan@gmail.com>
Date: Thu, 17 Dec 2015 09:16:18 -0500
Subject: [PATCH] Parse difficulty safely. Fixes #1634.

---
 .../com/onarandombox/MultiverseCore/MultiverseCore.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
index 076783a6..a5cf4e38 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
@@ -749,7 +749,14 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
 
                 // migrate difficulty
                 if (section.isString("difficulty")) {
-                    final Difficulty difficulty = Difficulty.valueOf(section.getString("difficulty").toUpperCase());
+                    Difficulty difficulty;
+                    try {
+                        difficulty = Difficulty.valueOf(section.getString("difficulty").toUpperCase());
+                    } catch (IllegalArgumentException e) {
+                        this.log(Level.WARNING, "Could not parse difficulty: " + section.getString("difficulty"));
+                        this.log(Level.WARNING, "Setting world " + entry.getKey() + " difficulty to NORMAL");
+                        difficulty = Difficulty.NORMAL;
+                    }
                     if (difficulty != null) {
                         world.setDifficulty(difficulty);
                     }