From 67ea8b9599de0f5e738088b69cddabdd75d6dc8e Mon Sep 17 00:00:00 2001
From: ajgeiss0702 <ajgeiss72@gmail.com>
Date: Fri, 5 Nov 2021 11:28:41 -0700
Subject: [PATCH] added toggle for forcing in queue-servers

---
 .../queue/common/QueueManagerImpl.java        | 30 ++++++++++---------
 common/src/main/resources/config.yml          |  6 ++++
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java
index c7cba56..7095fe5 100644
--- a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java
+++ b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java
@@ -409,20 +409,22 @@ public class QueueManagerImpl implements QueueManager {
 
     @Override
     public void sendQueueEvents() {
-        List<String> svs = main.getConfig().getStringList("queue-servers");
-        for(String s : svs) {
-            if(!s.contains(":")) continue;
-            String[] parts = s.split(":");
-            String fromName = parts[0];
-            String toName = parts[1];
-            AdaptedServer from = main.getPlatformMethods().getServer(fromName);
-            QueueServer to = findServer(toName);
-            if(from == null || to == null) continue;
-            from.getPlayers().forEach(player -> {
-                if(!getPlayerQueues(player).contains(to)) {
-                    addToQueue(player, to);
-                }
-            });
+        if(main.getConfig().getBoolean("force-queue-server-target")) {
+            List<String> svs = main.getConfig().getStringList("queue-servers");
+            for(String s : svs) {
+                if(!s.contains(":")) continue;
+                String[] parts = s.split(":");
+                String fromName = parts[0];
+                String toName = parts[1];
+                AdaptedServer from = main.getPlatformMethods().getServer(fromName);
+                QueueServer to = findServer(toName);
+                if(from == null || to == null) continue;
+                from.getPlayers().forEach(player -> {
+                    if(!getPlayerQueues(player).contains(to)) {
+                        addToQueue(player, to);
+                    }
+                });
+            }
         }
         for (QueueServer s : servers) {
             for (QueuePlayer queuePlayer : s.getQueue()) {
diff --git a/common/src/main/resources/config.yml b/common/src/main/resources/config.yml
index ddc7b1b..5ad6b70 100644
--- a/common/src/main/resources/config.yml
+++ b/common/src/main/resources/config.yml
@@ -296,5 +296,11 @@ give-pausedbypass-players-priority: 0
 # If you have the free version, set it to 1 to enable
 give-fulljoin-players-priority: 0
 
+
+# Should we force players to be queued every few seconds for queue-servers?
+# This will check every few seconds, and if a player in a queue-server is
+#  not in the queue for the target server, it will add them.
+force-queue-server-target: true
+
 # Should we print some extra stuff to the console that might help aj diagnose some issues?
 debug: false
\ No newline at end of file