Add weight to the mission slots (#601)

* Let the mission slot be a weight * Reverse order
Iridium-Development · Feb 7, 2022 · 06e80f7 · 06e80f7
1 parent 26955d1
commit 06e80f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/com/iridium/iridiumskyblock/IridiumSkyblock.java b/src/main/java/com/iridium/iridiumskyblock/IridiumSkyblock.java
@@ -287,9 +287,9 @@ private void resetIslandMissions() {
             @Override
             public void run() {
                 databaseManager.getIslandMissionTableManager().delete(
-                        databaseManager.getIslandMissionTableManager().getEntries().stream().filter(islandMission ->
-                                islandMission.getType() == Mission.MissionType.DAILY).collect(Collectors.toList()
-                        )
+                        databaseManager.getIslandMissionTableManager().getEntries().stream()
+                                .filter(islandMission -> islandMission.getType() == Mission.MissionType.DAILY)
+                                .collect(Collectors.toList())
                 );
                 Bukkit.getScheduler().runTask(IridiumSkyblock.getInstance(), () -> resetIslandMissions());
             }

diff --git a/src/main/java/com/iridium/iridiumskyblock/managers/IslandManager.java b/src/main/java/com/iridium/iridiumskyblock/managers/IslandManager.java
@@ -807,12 +807,13 @@ private synchronized String getDailyIslandMission(@NotNull Island island, int in
      * @return The daily missions
      */
     public synchronized Map<String, Mission> getDailyIslandMissions(@NotNull Island island) {
-        Map<String, Mission> missions = new HashMap<>();
+        Map<String, Mission> missions = new LinkedHashMap<>();
 
         IntStream.range(0, IridiumSkyblock.getInstance().getMissions().dailySlots.size())
                 .boxed()
                 .map(i -> getDailyIslandMission(island, i))
-                .forEach(mission ->
+                .sorted(Comparator.comparingInt(mission -> IridiumSkyblock.getInstance().getMissionsList().get(mission).getItem().slot))
+                .forEachOrdered(mission ->
                         missions.put(mission, IridiumSkyblock.getInstance().getMissionsList().get(mission))
                 );