Attempt on fixing the none issue

Author: AlexProgrammerDE

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

@@ -159,7 +159,6 @@ public void onEnable() {
                     ProxiedPlayer player = getProxy().getPlayer(entry.getKey());
 
                     if (player == null || !player.isConnected()) {
-                        getLogger().info("Removed bugged player from data!");
                         type.getQueueMap().remove(entry.getKey());
                     }
                 }

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

@@ -133,7 +133,6 @@ public void onDisconnect(PlayerDisconnectEvent event) {
         UUID uuid = event.getPlayer().getUniqueId();
 
         for (QueueType type : QueueType.values()) {
-            type.getQueueMap().remove(uuid);
             type.getPositionCache().remove(uuid);
         }
     }
@@ -187,44 +186,42 @@ private void moveVeteran(boolean canMoveRegular) {
     }
 
     private void connectPlayer(QueueType type) {
-        Optional<Entry<UUID, String>> optional = type.getQueueMap().entrySet().stream().findFirst();
-        if (!optional.isPresent())
-            return;
+        for (Entry<UUID, String> entry : type.getQueueMap().entrySet()) {
+            ProxiedPlayer player = plugin.getProxy().getPlayer(entry.getKey());
+            if (player == null || !player.isConnected()) {
+                continue;
+            }
 
-        Entry<UUID, String> entry = optional.get();
-        ProxiedPlayer player = plugin.getProxy().getPlayer(entry.getKey());
+            type.getQueueMap().remove(entry.getKey());
 
-        type.getQueueMap().remove(entry.getKey());
-        if (player == null || !player.isConnected())
-            return;
+            player.sendMessage(ChatMessageType.CHAT, ChatUtils.parseToComponent(Config.JOININGMAINSERVER.replace("%server%", entry.getValue())));
+            player.resetTabHeader();
 
-        player.sendMessage(ChatMessageType.CHAT, ChatUtils.parseToComponent(Config.JOININGMAINSERVER.replace("%server%", entry.getValue())));
-        player.resetTabHeader();
+            if (StorageTool.isShadowBanned(player)
+                    && (plugin.getBanType() == BanType.LOOP
+                    || (plugin.getBanType() == BanType.TENPERCENT && new Random().nextInt(100) >= 10))) {
+                player.sendMessage(ChatMessageType.CHAT, ChatUtils.parseToComponent(Config.SHADOWBANMESSAGE));
 
-        if (StorageTool.isShadowBanned(player)
-                && (plugin.getBanType() == BanType.LOOP
-                || (plugin.getBanType() == BanType.TENPERCENT && new Random().nextInt(100) >= 10))) {
-            player.sendMessage(ChatMessageType.CHAT, ChatUtils.parseToComponent(Config.SHADOWBANMESSAGE));
+                type.getQueueMap().put(entry.getKey(), entry.getValue());
 
-            type.getQueueMap().put(entry.getKey(), entry.getValue());
+                return;
+            }
 
-            return;
-        }
+            indexPositionTime();
 
-        indexPositionTime();
+            List<Pair<Integer, Instant>> cache = type.getPositionCache().get(entry.getKey());
 
-        List<Pair<Integer, Instant>> cache = type.getPositionCache().get(entry.getKey());
+            if (cache != null) {
+                cache.forEach(pair -> type.getDurationToPosition().put(pair.getLeft(), Duration.between(pair.getRight(), Instant.now())));
+            }
 
-        if (cache != null) {
-            cache.forEach(pair -> type.getDurationToPosition().put(pair.getLeft(), Duration.between(pair.getRight(), Instant.now())));
+            player.connect(plugin.getProxy().getServerInfo(entry.getValue()), (result, error) -> {
+                if (Config.RECOVERY && !Boolean.TRUE.equals(result)) {
+                    player.sendMessage(ChatMessageType.CHAT, ChatUtils.parseToComponent(Config.RECOVERYMESSAGE));
+                    type.getQueueMap().put(entry.getKey(), entry.getValue());
+                }
+            });
         }
-
-        player.connect(plugin.getProxy().getServerInfo(entry.getValue()), (result, error) -> {
-            if (Config.RECOVERY && !Boolean.TRUE.equals(result)) {
-                player.sendMessage(ChatMessageType.CHAT, ChatUtils.parseToComponent(Config.RECOVERYMESSAGE));
-                type.getQueueMap().put(entry.getKey(), entry.getValue());
-            }
-        });
     }
 
     private void putQueueAuthFirst(ProxiedPlayer player, List<String> header, List<String> footer, Map<UUID, String> queueMap) {