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

Fix issue when Challenges were not sorted by order number.

Browse Source
This commit is contained in:
BONNe 2019-02-10 17:00:30 +02:00
parent dff3608aa3
commit 2bbb4e5c87
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/world/bentobox/challenges/ChallengesManager.java
View File

@ -689,8 +689,8 @@ public class ChallengesManager
String worldName = Util.getWorld(world).getName(); String worldName = Util.getWorld(world).getName();
// TODO: Probably need to check also database. // TODO: Probably need to check also database.
return this.challengeCacheData.values().stream(). return this.challengeCacheData.values().stream().
sorted(Comparator.comparing(Challenge::getOrder)).
filter(challenge -> challenge.getUniqueId().startsWith(worldName)). filter(challenge -> challenge.getUniqueId().startsWith(worldName)).
sorted(Comparator.comparing(Challenge::getOrder)).
collect(Collectors.toList()); collect(Collectors.toList());
} }
@ -705,6 +705,7 @@ public class ChallengesManager
// Free Challenges hides under FREE level. // Free Challenges hides under FREE level.
return this.getAllChallenges(world).stream(). return this.getAllChallenges(world).stream().
filter(challenge -> challenge.getLevel().equals(FREE)). filter(challenge -> challenge.getLevel().equals(FREE)).
sorted(Comparator.comparing(Challenge::getOrder)).
collect(Collectors.toList()); collect(Collectors.toList());
} }
@ -719,6 +720,7 @@ public class ChallengesManager
return level.getChallenges().stream(). return level.getChallenges().stream().
map(this::getChallenge). map(this::getChallenge).
filter(Objects::nonNull). filter(Objects::nonNull).
sorted(Comparator.comparing(Challenge::getOrder)).
collect(Collectors.toList()); collect(Collectors.toList());
} }