Update QueueListener to handle Optional<RegisteredServer> correctly

Meekiavelique · Aug 2, 2024 · d982ddd · d982ddd
1 parent d29996c
commit d982ddd
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/main/java/com/meekdev/meekueue/QueueListener.java b/src/main/java/com/meekdev/meekueue/QueueListener.java
@@ -20,24 +20,25 @@ public QueueListener(QueueManager queueManager, Meekueue plugin) {
     @Subscribe
     public void onServerPreConnect(ServerPreConnectEvent event) {
         Player player = event.getPlayer();
-        RegisteredServer targetServer = event.getResult().getServer().orElse(null);
+        Optional<RegisteredServer> targetServer = event.getResult().getServer();
 
-        if (targetServer != null && !isMainServer(targetServer)) {
+        if (targetServer.isPresent() && !isMainServer(targetServer.get())) {
             queueManager.addToQueue(player);
         }
     }
 
     @Subscribe
     public void onServerPostConnect(ServerPostConnectEvent event) {
         Player player = event.getPlayer();
-        RegisteredServer previousServer = event.getPreviousServer().orElse(null);
-        RegisteredServer currentServer = player.getCurrentServer().map(connection -> connection.getServer()).orElse(null);
+        Optional<RegisteredServer> previousServer = event.getPreviousServer();
+        Optional<RegisteredServer> currentServer = player.getCurrentServer().map(connection -> connection.getServer());
 
-        if (isMainServer(previousServer) && !isMainServer(currentServer)) {
+        if (previousServer.isPresent() && isMainServer(previousServer.get()) &&
+                currentServer.isPresent() && !isMainServer(currentServer.get())) {
             queueManager.addToQueue(player);
         }
 
-        if (isMainServer(currentServer)) {
+        if (currentServer.isPresent() && isMainServer(currentServer.get())) {
             queueManager.removeFromQueue(player);
         }
     }