Fix issue when Levels were not loaded with world name in unique ID.

Fix crash that appears after renaming Level to Other challenge type.
BentoBoxWorld · Jan 23, 2019 · 9c4c5b7 · 9c4c5b7
1 parent bf22a50
commit 9c4c5b7
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/main/java/world/bentobox/challenges/ChallengesImportManager.java b/src/main/java/world/bentobox/challenges/ChallengesImportManager.java
@@ -83,7 +83,7 @@ private void makeLevels(User user, World world, boolean overwrite) {
             for (String level : lvs) {
                 ChallengeLevel challengeLevel = new ChallengeLevel();
                 challengeLevel.setFriendlyName(level);
-                challengeLevel.setUniqueId(level);
+                challengeLevel.setUniqueId(Util.getWorld(world).getName() + "_" + level);
                 challengeLevel.setOrder(order++);
                 challengeLevel.setWorld(Util.getWorld(world).getName());
                 challengeLevel.setWaiverAmount(chal.getInt("challenges.waiveramount"));
@@ -120,7 +120,17 @@ private void makeChallenges(User user, World world, boolean overwrite) {
             newChallenge.setFriendlyName(details.getString("friendlyname", challenge));
             newChallenge.setDescription(GuiUtils.stringSplit(details.getString("description", "")));
             newChallenge.setIcon(ItemParser.parse(details.getString("icon") + ":1"));
-            newChallenge.setChallengeType(Challenge.ChallengeType.valueOf(details.getString("type","INVENTORY").toUpperCase()));
+
+            if (details.getString("type").equalsIgnoreCase("level"))
+            {
+                // Fix for older version config
+                newChallenge.setChallengeType(Challenge.ChallengeType.OTHER);
+            }
+            else
+            {
+                newChallenge.setChallengeType(Challenge.ChallengeType.valueOf(details.getString("type","INVENTORY").toUpperCase()));
+            }
+
             newChallenge.setTakeItems(details.getBoolean("takeItems",true));
             newChallenge.setRewardText(details.getString("rewardText", ""));
             newChallenge.setRewardCommands(details.getStringList("rewardcommands"));