From 25cf0ce6f37a5b36fd83365a733c3d4f60709960 Mon Sep 17 00:00:00 2001
From: ajgeiss0702 <ajgeiss72@gmail.com>
Date: Fri, 18 Jun 2021 07:03:27 -0700
Subject: [PATCH] More possible cme fixes

---
 src/main/java/us/ajg0702/queue/Manager.java     | 5 ++++-
 src/main/java/us/ajg0702/queue/QueueServer.java | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/us/ajg0702/queue/Manager.java b/src/main/java/us/ajg0702/queue/Manager.java
index fd7c23b..f7abebe 100644
--- a/src/main/java/us/ajg0702/queue/Manager.java
+++ b/src/main/java/us/ajg0702/queue/Manager.java
@@ -335,7 +335,10 @@ public class Manager {
 		for(Iterator<QueueServer> it = servers.iterator(); it.hasNext();) {
 			QueueServer s = it.next();
 			for(Iterator<ProxiedPlayer> pit = s.getQueue().iterator(); pit.hasNext();) {
-				BungeeUtils.sendCustomData(pit.next(), "inqueueevent", "true");
+				ProxiedPlayer player = pit.next();
+				if(player == null) continue;
+				if(!player.isConnected()) continue;
+				BungeeUtils.sendCustomData(player, "inqueueevent", "true");
 			}
 		}
 	}
diff --git a/src/main/java/us/ajg0702/queue/QueueServer.java b/src/main/java/us/ajg0702/queue/QueueServer.java
index 9d15f9e..7cb3c91 100644
--- a/src/main/java/us/ajg0702/queue/QueueServer.java
+++ b/src/main/java/us/ajg0702/queue/QueueServer.java
@@ -144,7 +144,7 @@ public class QueueServer {
 	
 	
 	List<ProxiedPlayer> queue = new ArrayList<>();
-	public List<ProxiedPlayer> getQueue() {
+	public synchronized List<ProxiedPlayer> getQueue() {
 		return queue;
 	}