Upstream/addon-challenges
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/Challenges.git synced 2024-11-24 11:36:53 +01:00
Code Issues Projects Releases Wiki Activity

Fix some issues in ImportManager.

Browse Source
This commit is contained in:
BONNe1704 2019-01-28 18:15:43 +02:00
parent abfe81c5e6
commit 78fccc996e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/world/bentobox/challenges/ChallengesImportManager.java
View File

@ -229,12 +229,23 @@ public class ChallengesImportManager
for (ChallengeLevels level : levels) 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) for (Challenges challenge : challenges)
{ {
Challenge newChallenge = this.createChallenge(challenge, world); Challenge newChallenge = this.createChallenge(challenge, world);
if (newChallenge == null)
{
continue;
}
manager.loadChallenge(newChallenge, overwrite, user, false); manager.loadChallenge(newChallenge, overwrite, user, false);
if (challenge.getLevel().isEmpty() || challenge.getLevel().equals("FREE")) if (challenge.getLevel().isEmpty() || challenge.getLevel().equals("FREE"))
@ -266,7 +277,7 @@ public class ChallengesImportManager
*/ */
private ChallengeLevel createLevel(ChallengeLevels level, World world) private ChallengeLevel createLevel(ChallengeLevels level, World world)
{ {
if (!level.getWorlds().isEmpty() || if (!level.getWorlds().isEmpty() &&
!level.getWorlds().contains(Util.getWorld(world).getName())) !level.getWorlds().contains(Util.getWorld(world).getName()))
{ {
return null; return null;
@ -310,6 +321,7 @@ public class ChallengesImportManager
newChallenge.setFriendlyName(challenge.getFriendlyName()); newChallenge.setFriendlyName(challenge.getFriendlyName());
newChallenge.setRemoveWhenCompleted(challenge.isRemoveWhenCompleted()); newChallenge.setRemoveWhenCompleted(challenge.isRemoveWhenCompleted());
newChallenge.setDeployed(challenge.isDeployed()); newChallenge.setDeployed(challenge.isDeployed());
newChallenge.setIcon(challenge.getIcon());
newChallenge.setEnvironment(new HashSet<>(challenge.getEnvironment())); newChallenge.setEnvironment(new HashSet<>(challenge.getEnvironment()));