fix: resolve issues

Author: AlexProgrammerDE

shared/src/main/java/net/pistonmaster/pistonqueue/shared/queue/QueueType.java

@@ -28,6 +28,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -42,6 +43,7 @@ public class QueueType {
   private final ReadWriteLock queueLock = new ReentrantReadWriteLock();
   private final ReadWriteLock durationLock = new ReentrantReadWriteLock();
   private final Map<UUID, Map<Integer, Instant>> positionCache = new ConcurrentHashMap<>();
+  private final Set<UUID> activeTransfers = ConcurrentHashMap.newKeySet();
   private final AtomicInteger playersWithTypeInTarget = new AtomicInteger();
   private final String name;
   @Setter

shared/src/main/java/net/pistonmaster/pistonqueue/shared/queue/logic/QueueConnector.java

@@ -86,6 +86,7 @@ public void connectPlayers(QueueGroup group, QueueType type) {
 
       Optional<PlayerWrapper> optional = environment.plugin().getPlayer(entry.getKey());
       if (optional.isEmpty()) {
+        type.getActiveTransfers().remove(entry.getKey());
         continue;
       }
       PlayerWrapper player = optional.get();
@@ -118,6 +119,7 @@ public void connectPlayers(QueueGroup group, QueueType type) {
       }
 
       player.connect(entry.getValue().targetServer());
+      type.getActiveTransfers().remove(entry.getKey());
 
       movesLeft--;
     }
@@ -183,6 +185,7 @@ private Map.Entry<UUID, QueueType.QueuedPlayer> pollNextQueueEntry(QueueType typ
 
       Map.Entry<UUID, QueueType.QueuedPlayer> entry = iterator.next();
       iterator.remove();
+      type.getActiveTransfers().add(entry.getKey());
       return new AbstractMap.SimpleEntry<>(entry);
     } finally {
       writeLock.unlock();
@@ -193,6 +196,7 @@ private void requeuePlayer(QueueType type, Map.Entry<UUID, QueueType.QueuedPlaye
     Lock writeLock = type.getQueueLock().writeLock();
     writeLock.lock();
     try {
+      type.getActiveTransfers().remove(entry.getKey());
       type.getQueueMap().put(entry.getKey(), entry.getValue());
     } finally {
       writeLock.unlock();

shared/src/main/java/net/pistonmaster/pistonqueue/shared/queue/logic/QueueRecoveryHandler.java

@@ -44,7 +44,9 @@ public void recoverPlayer(PlayerWrapper player) {
     QueueGroup group = environment.resolveGroupForType(type);
 
     Optional<String> currentServer = player.getCurrentServer();
-    if (currentServer.isPresent() && currentServer.get().equals(group.getQueueServer())) {
+    if (currentServer.isPresent()
+      && currentServer.get().equals(group.getQueueServer())
+      && !type.getActiveTransfers().contains(player.getUniqueId())) {
       boolean addedToQueue = false;
       Lock writeLock = type.getQueueLock().writeLock();
       writeLock.lock();