added kick-on-restart, kick-on-busy and removed name from config

Author: bierdosenhalter

run/proxy/velocity.toml

@@ -125,7 +125,7 @@ read-timeout = 30000
 haproxy-protocol = false
 
 # Enables TCP fast open support on the proxy. Requires the proxy to run on Linux.
-tcp-fast-open = true
+tcp-fast-open = false
 
 # Enables BungeeCord plugin messaging channel support on Velocity.
 bungee-plugin-message-channel = true

src/main/java/org/zeroBzeroT/anarchyqueue/Config.java

@@ -13,8 +13,6 @@ public class Config {
 
     public static String queue = null;
 
-    public static String name = null; // TODO: not in use, implement or remove this
-
     public static int maxPlayers = 0;
 
     public static String messagePosition = null;
@@ -25,7 +23,11 @@ public class Config {
 
     public static String messageOffline = null;
 
-    public static boolean kick = true;
+    public static boolean kickPassthrough = true;
+
+    public static boolean kickOnRestart = false;
+
+    public static boolean kickOnBusy = false;
 
     public static int waitOnKick = 16;
 
@@ -61,13 +63,14 @@ static void loadConfig(Path path) throws IOException {
         Toml toml = new Toml().read(file);
         target = toml.getString("target", "main");
         queue = toml.getString("queue", "queue");
-        name = toml.getString("name", "0b0t");
         maxPlayers = toml.getLong("max-players", 420L).intValue();
         messagePosition = toml.getString("message-position", "Position in queue: ");
         messageConnecting = toml.getString("message-connecting", "Connecting to the server...");
         messageFull = toml.getString("message-full", "Server is currently full!");
         messageOffline = toml.getString("message-offline", "Server is currently offline!");
-        kick = toml.getBoolean("kick", true);
+        kickPassthrough = toml.getBoolean("kick-passthrough", true);
+        kickOnRestart = toml.getBoolean("kick-on-restart", false);
+        kickOnBusy = toml.getBoolean("kick-on-busy", false);
         waitOnKick = toml.getLong("wait-on-kick", 16L).intValue();
         sendTitle = toml.getBoolean("send-title", true);
         bStats = toml.getBoolean("bStats", true);

src/main/java/org/zeroBzeroT/anarchyqueue/Queue.java

@@ -10,6 +10,7 @@
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import net.kyori.adventure.title.Title;
 
 import java.time.Duration;
@@ -73,6 +74,13 @@ public int getSize() {
         return playerQueue.size();
     }
 
+    /**
+     * Converts Component to a plain string
+     */
+    private String toPlainText(Component component) {
+        return PlainTextComponentSerializer.plainText().serialize(component);
+    }
+
     /**
      * This event is fired before the player connects to a server.
      * Velocity will wait on this event to finish firing before initiating the connection.
@@ -95,7 +103,7 @@ public void onServerPreConnect(ServerPreConnectEvent event) {
                 if (currentPlayers < Config.maxPlayers) {
                     // Allow direct connection to target server
                     event.setResult(ServerPreConnectEvent.ServerResult.allowed(serverTarget));
-                    log.info(mm("<white>" + event.getPlayer().getUsername() + "<dark_aqua> was directly connected to server <aqua>" + Config.target + "<dark_aqua>. Main count is " + (getSize() + 1) + " of " + Config.maxPlayers + "."));
+                    log.info(mm("<white>" + event.getPlayer().getUsername() + "<dark_aqua> was directly connected to server <aqua>" + Config.target + "<dark_aqua>. Main count is " + (serverTarget.getPlayersConnected().size() + 1) + " of " + Config.maxPlayers + "."));
                 } else {
                     // Notify player that server is full
                     event.getPlayer().sendMessage(mm(Config.messageFull));
@@ -167,16 +175,26 @@ public void onPlayerDisconnect(DisconnectEvent event) {
         }
     }
 
-
     /**
      * Kick a player if kicking is allowed in the config
      *
      * @param player Player to kick
      * @param reason kicking reason from the target server
      */
     private void KickOrRequeue(Player player, Component reason) {
-        // is kicking  enabled?
-        if (!Config.kick) {
+        String textReason = toPlainText(reason);
+
+        // Cancel the event, if one of the following:
+        // - kicking is not enabled
+        // - target is restarting (and restart kicks are disabled)
+        // - target is busy with connecting players (and busy kicks are disabled)
+        if (!Config.kickPassthrough
+                || (!Config.kickOnRestart && textReason.contains("Server is restarting")) // Restart
+                || (!Config.kickOnRestart && textReason.contains("Kicked without a reason.")) // Server went down
+                || (!Config.kickOnRestart && textReason.contains("Server closed")) // Server stopped
+                || (!Config.kickOnBusy && textReason.contains("Too many people logging in, retry soon.")) // NCP
+                || (!Config.kickOnBusy && textReason.contains("Too fast re-login, try with a little delay.")) // NCP
+        ) {
             // save the disconnection time
             kickedPlayers.put(player, Instant.now().getEpochSecond());
 

src/main/resources/config.toml

@@ -1,12 +1,13 @@
 target = "main"
 queue = "queue"
-name = "0b0t"
 max-players = 420
 message-position = "<gold>Position in queue: <bold>%position%<reset>"
 message-connecting = "<gold>Connecting to the server...<reset>"
 message-full = "<red>Server is currently full!<reset>"
 message-offline = "<red>Server is currently down!<reset>"
-kick = true
+kick-passthrough = true
+kick-on-restart = false
+kick-on-busy = false
 wait-on-kick = 16
 send-title = true
 bStats = true