mirror of
https://github.com/BentoBoxWorld/Challenges.git
synced 2024-11-01 00:11:37 +01:00
Fix some issues in ImportManager.
This commit is contained in:
parent
abfe81c5e6
commit
78fccc996e
@ -229,12 +229,23 @@ public class ChallengesImportManager
|
||||
|
||||
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 class ChallengesImportManager
|
||||
*/
|
||||
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 @@ public class ChallengesImportManager
|
||||
newChallenge.setFriendlyName(challenge.getFriendlyName());
|
||||
newChallenge.setRemoveWhenCompleted(challenge.isRemoveWhenCompleted());
|
||||
newChallenge.setDeployed(challenge.isDeployed());
|
||||
newChallenge.setIcon(challenge.getIcon());
|
||||
|
||||
newChallenge.setEnvironment(new HashSet<>(challenge.getEnvironment()));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user