Fix some issues in ImportManager.

BentoBoxWorld · Jan 28, 2019 · 78fccc9 · 78fccc9
1 parent abfe81c
commit 78fccc9
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/main/java/world/bentobox/challenges/ChallengesImportManager.java b/src/main/java/world/bentobox/challenges/ChallengesImportManager.java
@@ -229,12 +229,23 @@ public boolean importPreviousChallenges(User user, World world, boolean overwrit
 
             for (ChallengeLevels level : levels)
             {
-                manager.loadLevel(this.createLevel(level, world), overwrite, user, false);
+                ChallengeLevel newlevel = this.createLevel(level, world);
+
+                if (newlevel != null)
+                {
+                    manager.loadLevel(newlevel, overwrite, user, false);
+                }
             }
 
             for (Challenges challenge : challenges)
             {
                 Challenge newChallenge = this.createChallenge(challenge, world);
+
+                if (newChallenge == null)
+                {
+                    continue;
+                }
+
                 manager.loadChallenge(newChallenge, overwrite, user, false);
 
                 if (challenge.getLevel().isEmpty() || challenge.getLevel().equals("FREE"))
@@ -266,7 +277,7 @@ public boolean importPreviousChallenges(User user, World world, boolean overwrit
      */
     private ChallengeLevel createLevel(ChallengeLevels level, World world)
     {
-        if (!level.getWorlds().isEmpty() ||
+        if (!level.getWorlds().isEmpty() &&
             !level.getWorlds().contains(Util.getWorld(world).getName()))
         {
             return null;
@@ -310,6 +321,7 @@ private Challenge createChallenge(Challenges challenge, World world)
         newChallenge.setFriendlyName(challenge.getFriendlyName());
         newChallenge.setRemoveWhenCompleted(challenge.isRemoveWhenCompleted());
         newChallenge.setDeployed(challenge.isDeployed());
+        newChallenge.setIcon(challenge.getIcon());
 
         newChallenge.setEnvironment(new HashSet<>(challenge.getEnvironment()));