Merge remote-tracking branch 'origin/dev' into dev

common/src/main/java/us/ajg0702/queue/commands/commands/SlashServer/SlashServerCommand.java

@@ -45,6 +45,10 @@ public class SlashServerCommand extends BaseCommand {
             sender.sendMessage(getMessages().getComponent("errors.player-only"));
             return;
         }
+        if(main.getConfig().getBoolean("require-permission") && !sender.hasPermission("ajqueue.queue."+args[0])) {
+            sender.sendMessage(getMessages().getComponent("noperm"));
+            return;
+        }
         main.getQueueManager().addToQueue(main.getPlatformMethods().senderToPlayer(sender), server);
     }
 

common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java

@@ -49,6 +49,9 @@ public class QueueManagerImpl implements QueueManager {
             if(previousServer != null) {
                 queueServer.setPaused(previousServer.isPaused());
                 queueServer.setLastSentTime(previousServer.getLastSentTime());
+                queueServer.setOnline(previousServer.isOnline());
+                queueServer.setWhitelisted(previousServer.isWhitelisted());
+                queueServer.setWhitelistedPlayers(previousServer.getWhitelistedPlayers());
             }
             result.add(queueServer);
         }

common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java

@@ -468,4 +468,9 @@ public class QueueServerImpl implements QueueServer {
         if(!pings.containsKey(server)) throw new IllegalArgumentException("Server is not in this group!");
         pings.get(server).addPlayer();
     }
+
+    @Override
+    public void setOnline(boolean online) {
+        this.online = online;
+    }
 }