Fix stupid unsorted position bug

Author: AlexProgrammerDE

src/main/java/net/pistonmaster/pistonqueue/bungee/PistonQueue.java

@@ -269,16 +269,16 @@ private void sendMessage(QueueType queue, boolean bool, ChatMessageType type) {
 
             int position = 0;
 
-            for (Entry<UUID, String> entry : new HashMap<>(queue.getQueueMap()).entrySet()) {
-                position++;
-
+            for (Entry<UUID, String> entry : new LinkedHashMap<>(queue.getQueueMap()).entrySet()) {
                 ProxiedPlayer player = getProxy().getPlayer(entry.getKey());
 
                 if (player == null || !player.isConnected()) {
                     queue.getQueueMap().remove(entry.getKey());
                     continue;
                 }
 
+                position++;
+
                 player.sendMessage(type,
                         ChatUtils.parseToComponent(Config.QUEUEPOSITION
                                 .replace("%position%", String.valueOf(position))
@@ -291,15 +291,15 @@ private void sendMessage(QueueType queue, boolean bool, ChatMessageType type) {
     private void updateTab(QueueType queue, List<String> header, List<String> footer) {
         int position = 0;
 
-        for (Entry<UUID, String> entry : new HashMap<>(queue.getQueueMap()).entrySet()) {
-            position++;
-
+        for (Entry<UUID, String> entry : new LinkedHashMap<>(queue.getQueueMap()).entrySet()) {
             ProxiedPlayer player = getProxy().getPlayer(entry.getKey());
             if (player == null || !player.isConnected()) {
                 queue.getQueueMap().remove(entry.getKey());
                 continue;
             }
 
+            position++;
+
             StringBuilder headerBuilder = new StringBuilder();
             StringBuilder footerBuilder = new StringBuilder();
 
@@ -327,7 +327,10 @@ private void updateTab(QueueType queue, List<String> header, List<String> footer
 
     private String replacePosition(String text, UUID uuid, int position, QueueType type) {
         if (type.getPositionCache().containsKey(uuid)) {
-            type.getPositionCache().get(uuid).add(new Pair<>(position, Instant.now()));
+            List<Pair<Integer, Instant>> list = type.getPositionCache().get(uuid);
+            if (list.stream().map(Pair::getLeft).noneMatch(integer -> integer == position)) {
+                list.add(new Pair<>(position, Instant.now()));
+            }
         } else {
             List<Pair<Integer, Instant>> list = new ArrayList<>();
             list.add(new Pair<>(position, Instant.now()));
@@ -337,12 +340,7 @@ private String replacePosition(String text, UUID uuid, int position, QueueType t
         if (type.getDurationToPosition().containsKey(position)) {
             Duration duration = type.getDurationToPosition().get(position);
 
-            String format = String.format("%dh %dm", duration.toHours(), duration.toMinutes() % 60);
-
-            if (duration.toHours() == 0)
-                format = String.format("%dm", duration.toMinutes());
-
-            return text.replace("%position%", String.valueOf(position)).replace("%wait%", format);
+            return format(text, duration, position);
         } else {
             AtomicInteger biggestPositionAtomic = new AtomicInteger();
             AtomicReference<Duration> bestDurationAtomic = new AtomicReference<>(Duration.ZERO);

src/main/java/net/pistonmaster/pistonqueue/bungee/listeners/QueueListener.java

@@ -281,7 +281,7 @@ private boolean isAuthToQueue(ServerSwitchEvent event) {
     }
 
     private boolean isAnyoneQueued() {
-        for (QueueType type :QueueType.values()) {
+        for (QueueType type : QueueType.values()) {
             if (!type.getQueueMap().isEmpty())
                 return true;
         }