3.0.4 Release

Includes some other, minor fixes
Some proxy modules cleanup

.github/CHANGELOG.md

@@ -1,6 +1,34 @@
 # Maintenance Changelog
 This file contains update logs for this project. The top may contain a `Unreleased` section, gathering update logs for a future update during development.
 
+## 3.0.4 - March 17th 2020
+### Changed
+* Bungee/Velocity: Added config option `waiting-server` to send players to a waiting server when global maintenance is enabled (instead of kicking them)
+* Bungee/Velocity: Added config option `use-ssl` in the `mysql` section to disable SSL connections
+* Added Russian language file (thanks to Spigot user En_0t_S)
+* Updated missing translations in Portuguese language file (thanks to Spigot user JoaoPinto)
+* Updated bStats metrics
+### Fixed
+* Fixed singleserver timers using input as seconds instead of minutes (by mxs42)
+* Fixed language updating with an unknown/self-translated language file
+* Fixed Velocity server autocompletion in the maintenance command
+---
+## 3.0.3 - September 17th 2019
+### Changed
+* Bungee/Velocity: Added `maintenance.singleserver.bypass.<server>` permission to give individual bypasses for proxied servers (`maintenance.bypass` will still bypass everything as the super-perm)
+* Added the messages of the help command into the language files
+* Added config option `kick-online-players` to disable the kicks when maintenance is enabled (new connections will still be blocked)... not sure why you'd want that, but you can :p
+* The language file will now be automatically updated as well, so no need to delete and recreate it anymore, yay!
+* Updated missing and new translations in French language file (thanks to Spigot user Zendrique)
+* Updated missing and new translations in Spanish language file (thanks to Spigot user Vixo_Ulises)
+### Fixed
+* Bungee/Velocity: Fixed the join-notifications being sent twice if both global and server maintenance are enabled, as well as when just a server has maintenance in some cases
+* Bungee: Fixed players being kicked *after* the initial connection and thus triggering a join and leave message before being kicked
+* Bungee: Fixed the kickmessage not being displayed in some cases
+* Paper: Fixed the playercount message not being displayed on Paper servers with ViaVersion
+* Paper: Fixed the motd not being changed at all on Paper servers with ProtocolSupport (-> ProtocolLib listener used, since ProtocolSupport does not fire Paper's ping event)
+* Fixed the config autoupdater when the config contained strings broken over multiple lines
+---
 ## 3.0.2 - May 17th 2019
 ### Changed
 * Added config option `timerspecific-pingmessages` to have specific pingmessages shown when endtimers are run

.travis.yml

@@ -1,7 +1,7 @@
 language: java
 jdk:
   - oraclejdk8
-
+dist: trusty
 cache:
   directories:
-    - '$HOME/.m2'
+    - '$HOME/.m2/repository'

README.md

@@ -20,7 +20,7 @@ Its features include:
 A full list of commands, permissions and configuration options can be found in the wiki listed below.
 * [Wiki](https://github.com/KennyTV/Maintenance/wiki)
 * [Downloads](https://github.com/KennyTV/Maintenance/releases) (GitHub)
-* [Development builds](https://kennytv.eu/maintenance/snapshot/) (might be unstable)
+* [Development builds](https://kennytv.eu/maintenance/snapshot/) (out of order at the moment)
 * [Changelogs](https://github.com/KennyTV/Maintenance/blob/master/.github/CHANGELOG.md)
 * [Issue tracker/bug reports](https://github.com/KennyTV/Maintenance/issues)
 * [Discord](https://discord.gg/vGCUzHq)

maintenance-api/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.kennytv.maintenance</groupId>
         <artifactId>maintenance-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.0.4</version>
     </parent>
 
     <artifactId>maintenance-api</artifactId>
@@ -16,13 +16,13 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.13-SNAPSHOT</version>
+            <version>1.15-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.13.2-R0.1-SNAPSHOT</version>
+            <version>1.15.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

maintenance-api/src/main/java/eu/kennytv/maintenance/api/ISettings.java

@@ -52,6 +52,14 @@ public interface ISettings {
      */
     Map<UUID, String> getWhitelistedPlayers();
 
+    /**
+     * Returns whether the uuid is whitelisted.
+     *
+     * @param uuid uuid of the player to check
+     * @return true if the uuid is whitelisted
+     */
+    boolean isWhitelisted(UUID uuid);
+
     /**
      * Removes a player from the maintenance whitelist.
      *

maintenance-build/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.kennytv.maintenance</groupId>
         <artifactId>maintenance-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.0.4</version>
     </parent>
 
     <artifactId>maintenance-build</artifactId>
@@ -35,7 +35,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.2.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

maintenance-bungee/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.kennytv.maintenance</groupId>
         <artifactId>maintenance-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.0.4</version>
     </parent>
 
     <artifactId>maintenance-bungee</artifactId>
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
+            <version>1.7.30</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.14-SNAPSHOT</version>
+            <version>1.15-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -40,7 +40,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.2.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

maintenance-bungee/src/main/java/eu/kennytv/maintenance/bungee/MaintenanceBungeePlugin.java

@@ -23,7 +23,6 @@ import eu.kennytv.maintenance.api.proxy.IMaintenanceProxy;
 import eu.kennytv.maintenance.api.proxy.Server;
 import eu.kennytv.maintenance.bungee.command.MaintenanceBungeeCommand;
 import eu.kennytv.maintenance.bungee.command.MaintenanceBungeeCommandBase;
-import eu.kennytv.maintenance.bungee.listener.PostLoginListener;
 import eu.kennytv.maintenance.bungee.listener.ProxyPingListener;
 import eu.kennytv.maintenance.bungee.listener.ServerConnectListener;
 import eu.kennytv.maintenance.bungee.metrics.MetricsLite;
@@ -78,7 +77,6 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
         sendEnableMessage();
 
         final PluginManager pm = getProxy().getPluginManager();
-        pm.registerListener(plugin, new PostLoginListener(this, settingsProxy));
         pm.registerListener(plugin, new ProxyPingListener(this, settingsProxy));
         pm.registerListener(plugin, new ServerConnectListener(this, settingsProxy));
         commandManager = new MaintenanceBungeeCommand(this, settingsProxy);
@@ -114,30 +112,49 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
     }
 
     public boolean isMaintenance(final ServerInfo serverInfo) {
-        return settingsProxy.isMaintenance(new BungeeServer(serverInfo));
+        return settingsProxy.isMaintenance(serverInfo.getName());
     }
 
     @Override
-    protected void kickPlayers() {
-        getProxy().getPlayers().stream()
-                .filter(p -> !hasPermission(p, "bypass") && !settingsProxy.getWhitelistedPlayers().containsKey(p.getUniqueId()))
-                .forEach(p -> p.disconnect(settingsProxy.getKickMessage()));
+    protected void kickPlayersFromProxy() {
+        for (final ProxiedPlayer p : getProxy().getPlayers()) {
+            if (!hasPermission(p, "bypass") && !settingsProxy.isWhitelisted(p.getUniqueId())) {
+                p.disconnect(settingsProxy.getKickMessage());
+            }
+        }
     }
 
     @Override
     protected void kickPlayers(final Server server, final Server fallback) {
         final ServerInfo fallbackServer = fallback != null ? ((BungeeServer) fallback).getServer() : null;
-        ((BungeeServer) server).getServer().getPlayers().forEach(p -> {
-            if (!hasPermission(p, "bypass") && !settingsProxy.getWhitelistedPlayers().containsKey(p.getUniqueId())) {
-                if (fallbackServer != null && fallbackServer.canAccess(p) && !isMaintenance(fallback)) {
-                    p.sendMessage(settingsProxy.getMessage("singleMaintenanceActivated").replace("%SERVER%", server.getName()));
-                    p.connect(fallbackServer);
+        final boolean checkForFallback = fallbackServer != null && !isMaintenance(fallback);
+        for (final ProxiedPlayer player : ((BungeeServer) server).getServer().getPlayers()) {
+            if (!hasPermission(player, "bypass") && !settingsProxy.isWhitelisted(player.getUniqueId())) {
+                if (checkForFallback && fallbackServer.canAccess(player)) {
+                    player.sendMessage(settingsProxy.getMessage("singleMaintenanceActivated").replace("%SERVER%", server.getName()));
+                    player.connect(fallbackServer);
                 } else
-                    p.disconnect(settingsProxy.getMessage("singleMaintenanceKickComplete").replace("%NEWLINE%", "\n").replace("%SERVER%", server.getName()));
+                    player.disconnect(settingsProxy.getMessage("singleMaintenanceKickComplete").replace("%NEWLINE%", "\n").replace("%SERVER%", server.getName()));
             } else {
-                p.sendMessage(settingsProxy.getMessage("singleMaintenanceActivated").replace("%SERVER%", server.getName()));
+                player.sendMessage(settingsProxy.getMessage("singleMaintenanceActivated").replace("%SERVER%", server.getName()));
             }
-        });
+        }
+    }
+
+    @Override
+    protected void kickPlayersTo(final Server server) {
+        final ServerInfo serverInfo = ((BungeeServer) server).getServer();
+        // Notifications done in global method
+        for (final ProxiedPlayer player : getProxy().getPlayers()) {
+            if (hasPermission(player, "bypass") || settingsProxy.isWhitelisted(player.getUniqueId())) continue;
+            if (player.getServer() != null && player.getServer().getInfo().getName().equals(serverInfo.getName())) continue;
+            if (serverInfo.canAccess(player) && !isMaintenance(serverInfo)) {
+                player.sendMessage(settingsProxy.getMessage("sentToWaitingServer").replace("%SERVER%", server.getName()));
+                player.connect(serverInfo);
+            } else {
+                player.disconnect(settingsProxy.getKickMessage());
+            }
+        }
     }
 
     @Override
@@ -166,7 +183,8 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
     @Override
     public String getServer(final SenderInfo sender) {
         final ProxiedPlayer player = getProxy().getPlayer(sender.getUuid());
-        return player != null ? player.getServer().getInfo().getName() : "";
+        if (player == null || player.getServer() == null) return null;
+        return player.getServer().getInfo().getName();
     }
 
     @Override

maintenance-bungee/src/main/java/eu/kennytv/maintenance/bungee/command/MaintenanceBungeeCommand.java

@@ -23,13 +23,15 @@ import eu.kennytv.maintenance.bungee.util.BungeeSenderInfo;
 import eu.kennytv.maintenance.core.proxy.SettingsProxy;
 import eu.kennytv.maintenance.core.proxy.command.MaintenanceProxyCommand;
 import eu.kennytv.maintenance.core.util.SenderInfo;
-import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Map;
 
 public final class MaintenanceBungeeCommand extends MaintenanceProxyCommand {
     private final MaintenanceBungeePlugin plugin;
@@ -51,9 +53,14 @@ public final class MaintenanceBungeeCommand extends MaintenanceProxyCommand {
 
     @Override
     public List<String> getServersCompletion(final String s) {
-        return plugin.getProxy().getServers().entrySet().stream().filter(entry -> entry.getKey().toLowerCase().startsWith(s))
-                .filter(entry -> !plugin.getSettingsProxy().getMaintenanceServers().contains(entry.getValue().getName()))
-                .map(entry -> entry.getValue().getName()).collect(Collectors.toList());
+        final List<String> list = new ArrayList<>();
+        for (final Map.Entry<String, ServerInfo> entry : plugin.getProxy().getServers().entrySet()) {
+            final String serverName = entry.getValue().getName();
+            if (entry.getKey().toLowerCase().startsWith(s) && !plugin.getSettingsProxy().getMaintenanceServers().contains(serverName)) {
+                list.add(serverName);
+            }
+        }
+        return list;
     }
 
     @Override
@@ -67,6 +74,10 @@ public final class MaintenanceBungeeCommand extends MaintenanceProxyCommand {
 
     @Override
     public List<String> getPlayersCompletion() {
-        return plugin.getProxy().getPlayers().stream().map(CommandSender::getName).collect(Collectors.toList());
+        final List<String> list = new ArrayList<>();
+        for (final ProxiedPlayer p : plugin.getProxy().getPlayers()) {
+            list.add(p.getName());
+        }
+        return list;
     }
 }

maintenance-bungee/src/main/java/eu/kennytv/maintenance/bungee/listener/PostLoginListener.java

@@ -1,51 +0,0 @@
-/*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package eu.kennytv.maintenance.bungee.listener;
-
-import eu.kennytv.maintenance.bungee.MaintenanceBungeePlugin;
-import eu.kennytv.maintenance.bungee.util.BungeeSenderInfo;
-import eu.kennytv.maintenance.core.Settings;
-import eu.kennytv.maintenance.core.listener.JoinListenerBase;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.TextComponent;
-import net.md_5.bungee.api.event.PostLoginEvent;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.event.EventHandler;
-
-public final class PostLoginListener extends JoinListenerBase implements Listener {
-    private final MaintenanceBungeePlugin plugin;
-
-    public PostLoginListener(final MaintenanceBungeePlugin plugin, final Settings settings) {
-        super(plugin, settings);
-        this.plugin = plugin;
-    }
-
-    @EventHandler
-    public void postLogin(final PostLoginEvent event) {
-        if (kickPlayer(new BungeeSenderInfo(event.getPlayer())))
-            event.getPlayer().disconnect(settings.getKickMessage());
-    }
-
-    @Override
-    protected void broadcastJoinNotification(final String name) {
-        final BaseComponent[] s = TextComponent.fromLegacyText(settings.getMessage("joinNotification").replace("%PLAYER%", name));
-        ProxyServer.getInstance().getPlayers().stream().filter(p -> plugin.hasPermission(p, "joinnotification")).forEach(p -> p.sendMessage(s));
-    }
-}

maintenance-bungee/src/main/java/eu/kennytv/maintenance/bungee/listener/ServerConnectListener.java

@@ -18,55 +18,89 @@
 
 package eu.kennytv.maintenance.bungee.listener;
 
+import eu.kennytv.maintenance.api.proxy.Server;
 import eu.kennytv.maintenance.bungee.MaintenanceBungeePlugin;
+import eu.kennytv.maintenance.bungee.util.BungeeSenderInfo;
+import eu.kennytv.maintenance.bungee.util.BungeeServer;
 import eu.kennytv.maintenance.core.proxy.SettingsProxy;
+import eu.kennytv.maintenance.core.proxy.listener.ProxyJoinListenerBase;
+import eu.kennytv.maintenance.core.proxy.util.ServerConnectResult;
+import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.TextComponent;
-import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ServerConnectEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
+import net.md_5.bungee.event.EventPriority;
 
-public final class ServerConnectListener implements Listener {
+public final class ServerConnectListener extends ProxyJoinListenerBase implements Listener {
     private final MaintenanceBungeePlugin plugin;
-    private final SettingsProxy settings;
-    private boolean warned;
 
     public ServerConnectListener(final MaintenanceBungeePlugin plugin, final SettingsProxy settings) {
+        super(plugin, settings);
         this.plugin = plugin;
-        this.settings = settings;
     }
 
     @EventHandler
-    public void serverConnect(final ServerConnectEvent event) {
-        final ProxiedPlayer player = event.getPlayer();
-        final ServerInfo target = event.getTarget();
-        if (!plugin.isMaintenance(target)) return;
-        if (plugin.hasPermission(player, "bypass") || settings.getWhitelistedPlayers().containsKey(player.getUniqueId())) return;
+    public void initialServerConnect(final ServerConnectEvent event) {
+        // Global maintenance check
+        if (event.isCancelled() || event.getReason() != ServerConnectEvent.Reason.JOIN_PROXY) return;
 
-        if (settings.isJoinNotifications()) {
-            final BaseComponent[] s = TextComponent.fromLegacyText(settings.getMessage("joinNotification").replace("%PLAYER%", player.getName()));
-            target.getPlayers().stream().filter(p -> plugin.hasPermission(p, "joinnotification")).forEach(p -> p.sendMessage(s));
-        }
-        // Normal serverconnect
-        if (event.getReason() != ServerConnectEvent.Reason.JOIN_PROXY && event.getReason() != ServerConnectEvent.Reason.KICK_REDIRECT
-                && event.getReason() != ServerConnectEvent.Reason.LOBBY_FALLBACK && event.getReason() != ServerConnectEvent.Reason.SERVER_DOWN_REDIRECT) {
-            player.sendMessage(settings.getMessage("singleMaintenanceKick").replace("%SERVER%", target.getName()));
-            event.setCancelled(true);
-            return;
-        }
-
-        // If it's the initial proxy join or a kick from another server, go back to fallback server
-        final ServerInfo fallback = plugin.getProxy().getServerInfo(settings.getFallbackServer());
-        if (fallback == null || !fallback.canAccess(player) || plugin.isMaintenance(fallback)) {
-            player.disconnect(settings.getMessage("singleMaintenanceKickComplete").replace("%NEWLINE%", "\n").replace("%SERVER%", target.getName()));
-            if (!warned) {
-                plugin.getLogger().warning("Could not send player to the set fallback server! Instead kicking player off the network!");
-                warned = true;
+        final BungeeSenderInfo sender = new BungeeSenderInfo(event.getPlayer());
+        if (shouldKick(sender)) {
+            final Server waitingServer = shouldConnectToWaitingServer(sender);
+            if (waitingServer != null) {
+                event.setTarget(((BungeeServer) waitingServer).getServer());
+                sender.sendMessage(settings.getMessage("sentToWaitingServer"));
+                return;
+            }
+
+            event.setCancelled(true);
+            event.getPlayer().disconnect(settings.getKickMessage());
+            if (settings.isJoinNotifications()) {
+                broadcastJoinNotification(sender.getName());
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void serverConnect(final ServerConnectEvent event) {
+        // Server specific maintenance check
+        if (event.isCancelled()) return;
+
+        final ProxiedPlayer player = event.getPlayer();
+        final boolean normalServerConnect = event.getReason() != ServerConnectEvent.Reason.JOIN_PROXY && event.getReason() != ServerConnectEvent.Reason.KICK_REDIRECT
+                && event.getReason() != ServerConnectEvent.Reason.LOBBY_FALLBACK && event.getReason() != ServerConnectEvent.Reason.SERVER_DOWN_REDIRECT;
+        final ServerConnectResult connectResult = serverConnect(new BungeeSenderInfo(player), new BungeeServer(event.getTarget()), normalServerConnect);
+        if (connectResult.isCancelled()) {
+            event.setCancelled(true);
+
+            // Player has no server to connect to
+            if (player.getServer() == null) {
+                player.disconnect(settings.getKickMessage());
+            }
+        } else if (connectResult.getTarget() != null) {
+            event.setTarget(((BungeeServer) connectResult.getTarget()).getServer());
+        }
+    }
+
+    @Override
+    protected void broadcastJoinNotification(final String name) {
+        sendJoinMessage(ProxyServer.getInstance().getPlayers(), name);
+    }
+
+    @Override
+    protected void broadcastJoinNotification(final String name, final Server server) {
+        sendJoinMessage(((BungeeServer) server).getServer().getPlayers(), name);
+    }
+
+    private void sendJoinMessage(final Iterable<ProxiedPlayer> players, final String name) {
+        final BaseComponent[] message = TextComponent.fromLegacyText(settings.getMessage("joinNotification").replace("%PLAYER%", name));
+        for (final ProxiedPlayer player : players) {
+            if (plugin.hasPermission(player, "joinnotification")) {
+                player.sendMessage(message);
             }
-        } else {
-            event.setTarget(fallback);
         }
     }
 }

maintenance-bungee/src/main/java/eu/kennytv/maintenance/bungee/metrics/MetricsLite.java

@@ -23,6 +23,7 @@ import java.util.zip.GZIPOutputStream;
 public final class MetricsLite {
 
     public static final int B_STATS_VERSION = 1;
+    private static final int PLUGIN_ID = 742;
     private static final String URL = "https://bStats.org/submitData/bungeecord";
     private final Plugin plugin;
     private boolean enabled;
@@ -79,6 +80,7 @@ public final class MetricsLite {
         final String pluginVersion = plugin.getDescription().getVersion();
 
         data.addProperty("pluginName", pluginName);
+        data.addProperty("id", PLUGIN_ID);
         data.addProperty("pluginVersion", pluginVersion);
 
         final JsonArray customCharts = new JsonArray();
@@ -92,8 +94,7 @@ public final class MetricsLite {
     }
 
     private JsonObject getServerData() {
-        int playerAmount = plugin.getProxy().getOnlineCount();
-        playerAmount = playerAmount > 500 ? 500 : playerAmount;
+        final int playerAmount = Math.min(plugin.getProxy().getOnlineCount(), 500);
         final int onlineMode = plugin.getProxy().getConfig().isOnlineMode() ? 1 : 0;
         final String bungeecordVersion = plugin.getProxy().getVersion();
         final int managedServers = plugin.getProxy().getServers().size();
@@ -148,9 +149,9 @@ public final class MetricsLite {
     }
 
     private void loadConfig() throws IOException {
-        final Path configPath = plugin.getDataFolder().toPath().getParent().resolve("bStats");
-        configPath.toFile().mkdirs();
-        final File configFile = new File(configPath.toFile(), "config.yml");
+        final File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
+        bStatsFolder.mkdirs();
+        final File configFile = new File(bStatsFolder, "config.yml");
         if (!configFile.exists()) {
             writeFile(configFile,
                     "#bStats collects some data for plugin authors like how many servers are using their plugins.",
@@ -158,7 +159,7 @@ public final class MetricsLite {
                     "#This has nearly no effect on the server performance!",
                     "#Check out https://bStats.org/ to learn more :)",
                     "enabled: true",
-                    "serverUuid: \"" + UUID.randomUUID().toString() + "\"",
+                    "serverUuid: \"" + UUID.randomUUID() + "\"",
                     "logFailedRequests: false",
                     "logSentData: false",
                     "logResponseStatusText: false");
@@ -200,10 +201,7 @@ public final class MetricsLite {
         if (!file.exists()) {
             return null;
         }
-        try (
-                final FileReader fileReader = new FileReader(file);
-                final BufferedReader bufferedReader = new BufferedReader(fileReader);
-        ) {
+        try (final BufferedReader bufferedReader = new BufferedReader(new FileReader(file))) {
             return bufferedReader.readLine();
         }
     }
@@ -212,10 +210,7 @@ public final class MetricsLite {
         if (!file.exists()) {
             file.createNewFile();
         }
-        try (
-                final FileWriter fileWriter = new FileWriter(file);
-                final BufferedWriter bufferedWriter = new BufferedWriter(fileWriter)
-        ) {
+        try (final BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(file))) {
             for (final String line : lines) {
                 bufferedWriter.write(line);
                 bufferedWriter.newLine();
@@ -228,7 +223,7 @@ public final class MetricsLite {
             throw new IllegalArgumentException("Data cannot be null");
         }
         if (logSentData) {
-            plugin.getLogger().info("Sending data to bStats: " + data.toString());
+            plugin.getLogger().info("Sending data to bStats: " + data);
         }
 
         final HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
@@ -244,22 +239,19 @@ public final class MetricsLite {
         connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
 
         connection.setDoOutput(true);
-        final DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
-        outputStream.write(compressedData);
-        outputStream.flush();
-        outputStream.close();
+        try (final DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
+            outputStream.write(compressedData);
+        }
 
         if (logResponseStatusText) {
-            final InputStream inputStream = connection.getInputStream();
-            final BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
-
             final StringBuilder builder = new StringBuilder();
-            String line;
-            while ((line = bufferedReader.readLine()) != null) {
-                builder.append(line);
+            try (final BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+                String line;
+                while ((line = bufferedReader.readLine()) != null) {
+                    builder.append(line);
+                }
             }
-            bufferedReader.close();
-            plugin.getLogger().info("Sent data to bStats and received response: " + builder.toString());
+            plugin.getLogger().info("Sent data to bStats and received response: " + builder);
         } else {
             connection.getInputStream().close();
         }
@@ -270,9 +262,9 @@ public final class MetricsLite {
             return null;
         }
         final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        final GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
-        gzip.write(str.getBytes(StandardCharsets.UTF_8));
-        gzip.close();
+        try (final GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) {
+            gzip.write(str.getBytes(StandardCharsets.UTF_8));
+        }
         return outputStream.toByteArray();
     }
 

maintenance-bungee/src/main/java/eu/kennytv/maintenance/bungee/util/BungeeSenderInfo.java

@@ -18,14 +18,16 @@
 
 package eu.kennytv.maintenance.bungee.util;
 
-import eu.kennytv.maintenance.core.util.SenderInfo;
+import eu.kennytv.maintenance.api.proxy.Server;
+import eu.kennytv.maintenance.core.proxy.util.ProxySenderInfo;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.connection.Connection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 import java.util.UUID;
 
-public final class BungeeSenderInfo implements SenderInfo {
+public final class BungeeSenderInfo implements ProxySenderInfo {
     private final CommandSender sender;
 
     public BungeeSenderInfo(final CommandSender sender) {
@@ -60,4 +62,16 @@ public final class BungeeSenderInfo implements SenderInfo {
     public void sendMessage(final TextComponent textComponent) {
         sender.sendMessage(textComponent);
     }
+
+    @Override
+    public boolean canAccess(final Server server) {
+        return ((BungeeServer) server).getServer().canAccess(sender);
+    }
+
+    @Override
+    public void disconnect(final String message) {
+        if (sender instanceof Connection) {
+            ((Connection) sender).disconnect(message);
+        }
+    }
 }

maintenance-bungee/src/main/java/eu/kennytv/maintenance/bungee/util/BungeeServer.java

@@ -22,6 +22,7 @@ import eu.kennytv.maintenance.api.proxy.Server;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 public final class BungeeServer implements Server {
     private final ServerInfo server;
@@ -43,7 +44,9 @@ public final class BungeeServer implements Server {
     @Override
     public void broadcast(final String message) {
         final BaseComponent[] s = TextComponent.fromLegacyText(message);
-        server.getPlayers().forEach(p -> p.sendMessage(s));
+        for (final ProxiedPlayer p : server.getPlayers()) {
+            p.sendMessage(s);
+        }
     }
 
     public ServerInfo getServer() {

maintenance-core-proxy/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.kennytv.maintenance</groupId>
         <artifactId>maintenance-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.0.4</version>
     </parent>
 
     <artifactId>maintenance-core-proxy</artifactId>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>3.2.0</version>
+            <version>3.4.2</version>
             <scope>compile</scope>
             <!-- Shade slf4j specifically and only in the Bungee module to prevent issues -->
             <exclusions>

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/MaintenanceProxyPlugin.java

@@ -47,20 +47,22 @@ public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implement
     @Override
     public void disable() {
         super.disable();
-        if (settingsProxy.getMySQL() != null)
+        if (settingsProxy.getMySQL() != null) {
             settingsProxy.getMySQL().close();
+        }
     }
 
     @Override
     public void setMaintenance(final boolean maintenance) {
-        if (settingsProxy.hasMySQL())
+        if (settingsProxy.hasMySQL()) {
             settingsProxy.setMaintenanceToSQL(maintenance);
+        }
         super.setMaintenance(maintenance);
     }
 
     @Override
     public boolean isMaintenance(final Server server) {
-        return settingsProxy.isMaintenance(server);
+        return settingsProxy.isMaintenance(server.getName());
     }
 
     @Override
@@ -79,13 +81,16 @@ public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implement
         if (maintenance) {
             final Server fallback = getServer(settingsProxy.getFallbackServer());
             if (fallback == null) {
-                if (server.hasPlayers())
+                if (server.hasPlayers()) {
                     getLogger().warning("The set fallback could not be found! Instead kicking players from that server off the network!");
-            } else if (fallback.getName().equals(server.getName()))
+                }
+            } else if (fallback.getName().equals(server.getName())) {
                 getLogger().warning("Maintenance has been enabled on the fallback server! If a player joins on a proxied server, they will be kicked completely instead of being sent to the fallback server!");
+            }
             kickPlayers(server, fallback);
         } else
             server.broadcast(settingsProxy.getMessage("singleMaintenanceDeactivated").replace("%SERVER%", server.getName()));
+
         cancelSingleTask(server);
         eventManager.callEvent(new ServerMaintenanceChangedEvent(server, maintenance));
     }
@@ -107,7 +112,7 @@ public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implement
     }
 
     public MaintenanceRunnableBase startSingleMaintenanceRunnable(final Server server, final int minutes, final boolean enable) {
-        final MaintenanceRunnableBase runnable = new SingleMaintenanceRunnable(this, settingsProxy, minutes, enable, server);
+        final MaintenanceRunnableBase runnable = new SingleMaintenanceRunnable(this, settingsProxy, minutes * 60, enable, server);
         serverTasks.put(server.getName(), runnable.getTask());
         return runnable;
     }
@@ -125,6 +130,21 @@ public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implement
         return (MaintenanceProxyCommand) commandManager;
     }
 
+    @Override
+    protected void kickPlayers() {
+        // Send players to waiting server is set
+        if (settingsProxy.getWaitingServer() != null) {
+            final Server waitingServer = getServer(settingsProxy.getWaitingServer());
+            if (waitingServer != null) {
+                kickPlayersTo(waitingServer);
+                return;
+            }
+        }
+
+        // If not set, kick players from proxy
+        kickPlayersFromProxy();
+    }
+
     public SettingsProxy getSettingsProxy() {
         return settingsProxy;
     }
@@ -132,4 +152,8 @@ public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implement
     public abstract String getServer(SenderInfo sender);
 
     protected abstract void kickPlayers(Server server, Server fallback);
+
+    protected abstract void kickPlayersTo(Server server);
+
+    protected abstract void kickPlayersFromProxy();
 }

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/SettingsProxy.java

@@ -18,7 +18,6 @@
 
 package eu.kennytv.maintenance.core.proxy;
 
-import eu.kennytv.maintenance.api.proxy.Server;
 import eu.kennytv.maintenance.core.Settings;
 import eu.kennytv.maintenance.core.config.ConfigSection;
 import eu.kennytv.maintenance.core.proxy.mysql.MySQL;
@@ -32,6 +31,7 @@ import java.util.Set;
 public final class SettingsProxy extends Settings {
     private Set<String> maintenanceServers;
     private String fallbackServer;
+    private String waitingServer;
 
     private String mySQLTable;
     private String serverTable;
@@ -55,11 +55,13 @@ public final class SettingsProxy extends Settings {
             return;
         }
 
-        mySQL = new MySQL(section.getString("host"),
+        mySQL = new MySQL(plugin.getLogger(),
+                section.getString("host"),
                 section.getInt("port"),
                 section.getString("username"),
                 section.getString("password"),
-                section.getString("database"));
+                section.getString("database"),
+                section.getBoolean("use-ssl", true));
 
         // Varchar as the value regarding the possibility of saving stuff like the motd as well in future updates
         mySQLTable = section.getString("table", "maintenance_settings");
@@ -85,6 +87,11 @@ public final class SettingsProxy extends Settings {
         }
 
         fallbackServer = config.getString("fallback", "lobby");
+        waitingServer = config.getString("waiting-server", "");
+        if (waitingServer.isEmpty() || waitingServer.equalsIgnoreCase("none")) {
+            waitingServer = null;
+        }
+
         if (hasMySQL()) {
             maintenance = loadMaintenance();
             maintenanceServers = loadMaintenanceServersFromSQL();
@@ -113,26 +120,26 @@ public final class SettingsProxy extends Settings {
         return maintenance;
     }
 
-    public boolean isMaintenance(final Server server) {
+    public boolean isMaintenance(final String serverName) {
         if (hasMySQL() && System.currentTimeMillis() - lastServerCheck > millisecondsToCheck) {
             final Set<String> databaseValue = loadMaintenanceServersFromSQL();
             if (!maintenanceServers.equals(databaseValue)) {
                 final MaintenanceProxyPlugin plugin = (MaintenanceProxyPlugin) super.plugin;
                 // Enable maintenance on yet unlisted servers
-                databaseValue.forEach(s -> {
+                for (final String s : databaseValue) {
                     if (!maintenanceServers.contains(s))
                         plugin.serverActions(plugin.getServer(s), true);
-                });
+                }
                 // Disable maintenance on now unlisted servers
-                maintenanceServers.forEach(s -> {
+                for (final String s : maintenanceServers) {
                     if (!databaseValue.contains(s))
                         plugin.serverActions(plugin.getServer(s), false);
-                });
+                }
                 maintenanceServers = databaseValue;
             }
             lastServerCheck = System.currentTimeMillis();
         }
-        return maintenanceServers.contains(server.getName());
+        return maintenanceServers.contains(serverName);
     }
 
     public boolean hasMySQL() {
@@ -216,6 +223,10 @@ public final class SettingsProxy extends Settings {
         return fallbackServer;
     }
 
+    public String getWaitingServer() {
+        return waitingServer;
+    }
+
     MySQL getMySQL() {
         return mySQL;
     }

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/MaintenanceProxyCommand.java

@@ -25,8 +25,8 @@ import eu.kennytv.maintenance.core.proxy.SettingsProxy;
 import eu.kennytv.maintenance.core.proxy.command.subcommand.*;
 import eu.kennytv.maintenance.core.util.SenderInfo;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public abstract class MaintenanceProxyCommand extends MaintenanceCommand {
     private final MaintenanceProxyPlugin plugin;
@@ -50,7 +50,13 @@ public abstract class MaintenanceProxyCommand extends MaintenanceCommand {
 
     @Override
     public List<String> getMaintenanceServersCompletion(final String s) {
-        return settingsBungee.getMaintenanceServers().stream().filter(server -> server.toLowerCase().startsWith(s)).collect(Collectors.toList());
+        final List<String> list = new ArrayList<>();
+        for (final String server : settingsBungee.getMaintenanceServers()) {
+            if (server.toLowerCase().startsWith(s)) {
+                list.add(server);
+            }
+        }
+        return list;
     }
 
     public Server checkSingleTimerArgs(final SenderInfo sender, final String[] args) {

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/ProxyCommandInfo.java

@@ -25,8 +25,8 @@ import eu.kennytv.maintenance.core.proxy.SettingsProxy;
 public abstract class ProxyCommandInfo extends CommandInfo {
     protected final MaintenanceProxyPlugin plugin;
 
-    protected ProxyCommandInfo(final MaintenanceProxyPlugin plugin, final String permission, final String helpMessage) {
-        super(plugin, permission, helpMessage);
+    protected ProxyCommandInfo(final MaintenanceProxyPlugin plugin, final String permission) {
+        super(plugin, permission);
         this.plugin = plugin;
     }
 

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/subcommand/AbortSingleTimerCommand.java

@@ -29,7 +29,7 @@ import java.util.List;
 public final class AbortSingleTimerCommand extends ProxyCommandInfo {
 
     public AbortSingleTimerCommand(final MaintenanceProxyPlugin plugin) {
-        super(plugin, null, "§6/maintenance aborttimer [server] §7(If running, the current timer will be aborted)");
+        super(plugin, null);
     }
 
     @Override
@@ -63,7 +63,7 @@ public final class AbortSingleTimerCommand extends ProxyCommandInfo {
             plugin.cancelSingleTask(server);
             sender.sendMessage(getMessage("singleTimerCancelled"));
         } else
-            sender.sendMessage(helpMessage);
+            sender.sendMessage(getHelpMessage());
     }
 
     @Override

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/subcommand/SingleEndtimerCommand.java

@@ -30,7 +30,7 @@ import java.util.List;
 public final class SingleEndtimerCommand extends ProxyCommandInfo {
 
     public SingleEndtimerCommand(final MaintenanceProxyPlugin plugin) {
-        super(plugin, null, "§6/maintenance endtimer [server] <minutes> §7(After the given time in minutes, maintenance mode will be disabled)");
+        super(plugin, null);
     }
 
     @Override
@@ -43,7 +43,7 @@ public final class SingleEndtimerCommand extends ProxyCommandInfo {
         if (args.length == 2) {
             if (checkPermission(sender, "timer")) return;
             if (plugin.getCommandManager().checkTimerArgs(sender, args[1])) {
-                sender.sendMessage(helpMessage);
+                sender.sendMessage(getHelpMessage());
                 return;
             }
             if (!plugin.isMaintenance()) {
@@ -55,7 +55,7 @@ public final class SingleEndtimerCommand extends ProxyCommandInfo {
         } else if (args.length == 3) {
             if (checkPermission(sender, "singleserver.timer")) return;
             if (plugin.getCommandManager().checkTimerArgs(sender, args[2], false)) {
-                sender.sendMessage(helpMessage);
+                sender.sendMessage(getHelpMessage());
                 return;
             }
 
@@ -68,7 +68,7 @@ public final class SingleEndtimerCommand extends ProxyCommandInfo {
             final MaintenanceRunnableBase runnable = plugin.startSingleMaintenanceRunnable(server, Integer.parseInt(args[2]), false);
             sender.sendMessage(getMessage("endtimerStarted").replace("%TIME%", runnable.getTime()));
         } else
-            sender.sendMessage(helpMessage);
+            sender.sendMessage(getHelpMessage());
     }
 
     @Override

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/subcommand/SingleStarttimerCommand.java

@@ -30,7 +30,7 @@ import java.util.List;
 public final class SingleStarttimerCommand extends ProxyCommandInfo {
 
     public SingleStarttimerCommand(final MaintenanceProxyPlugin plugin) {
-        super(plugin, null, "§6/maintenance starttimer [server] <minutes> §7(After the given time in minutes, maintenance mode will be enabled)");
+        super(plugin, null);
     }
 
     @Override
@@ -43,7 +43,7 @@ public final class SingleStarttimerCommand extends ProxyCommandInfo {
         if (args.length == 2) {
             if (checkPermission(sender, "timer")) return;
             if (plugin.getCommandManager().checkTimerArgs(sender, args[1])) {
-                sender.sendMessage(helpMessage);
+                sender.sendMessage(getHelpMessage());
                 return;
             }
             if (plugin.isMaintenance()) {
@@ -56,7 +56,7 @@ public final class SingleStarttimerCommand extends ProxyCommandInfo {
         } else if (args.length == 3) {
             if (checkPermission(sender, "singleserver.timer")) return;
             if (plugin.getCommandManager().checkTimerArgs(sender, args[2], false)) {
-                sender.sendMessage(helpMessage);
+                sender.sendMessage(getHelpMessage());
                 return;
             }
 
@@ -70,7 +70,7 @@ public final class SingleStarttimerCommand extends ProxyCommandInfo {
             final MaintenanceRunnableBase runnable = plugin.startSingleMaintenanceRunnable(server, Integer.parseInt(args[2]), true);
             sender.sendMessage(getMessage("starttimerStarted").replace("%TIME%", runnable.getTime()));
         } else
-            sender.sendMessage(helpMessage);
+            sender.sendMessage(getHelpMessage());
     }
 
     @Override

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/subcommand/SingleToggleCommand.java

@@ -30,7 +30,7 @@ import java.util.List;
 public final class SingleToggleCommand extends ProxyCommandInfo {
 
     public SingleToggleCommand(final MaintenanceProxyPlugin plugin) {
-        super(plugin, null, "§6/maintenance <on/off> [server] §7(Enables/disables maintenance mode)");
+        super(plugin, null);
     }
 
     @Override
@@ -67,12 +67,14 @@ public final class SingleToggleCommand extends ProxyCommandInfo {
             }
 
             if (plugin.setMaintenanceToServer(server, maintenance)) {
-                if (!sender.isPlayer() || !plugin.getServer(sender).equals(server.getName()))
+                if (!sender.isPlayer() || !server.getName().equals(plugin.getServer(sender))) {
                     sender.sendMessage(getMessage(maintenance ? "singleMaintenanceActivated" : "singleMaintenanceDeactivated").replace("%SERVER%", server.getName()));
-            } else
+                }
+            } else {
                 sender.sendMessage(getMessage(maintenance ? "singleServerAlreadyEnabled" : "singleServerAlreadyDisabled").replace("%SERVER%", server.getName()));
+            }
         } else
-            sender.sendMessage(helpMessage);
+            sender.sendMessage(getHelpMessage());
     }
 
     @Override

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/subcommand/StatusCommand.java

@@ -25,7 +25,7 @@ import eu.kennytv.maintenance.core.util.SenderInfo;
 public final class StatusCommand extends ProxyCommandInfo {
 
     public StatusCommand(final MaintenanceProxyPlugin plugin) {
-        super(plugin, "singleserver.status", "§6/maintenance status §7(Lists all proxied servers, that are currently under maintenance)");
+        super(plugin, "singleserver.status");
     }
 
     @Override
@@ -34,7 +34,9 @@ public final class StatusCommand extends ProxyCommandInfo {
             sender.sendMessage(getMessage("singleServerMaintenanceListEmpty"));
         } else {
             sender.sendMessage(getMessage("singleServerMaintenanceList"));
-            getSettings().getMaintenanceServers().forEach(server -> sender.sendMessage("§8- §b" + server));
+            for (final String server : getSettings().getMaintenanceServers()) {
+                sender.sendMessage("§8- §b" + server);
+            }
         }
     }
 }

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/listener/ProxyJoinListenerBase.java

@@ -0,0 +1,120 @@
+/*
+ * Maintenance - https://git.io/maintenancemode
+ * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package eu.kennytv.maintenance.core.proxy.listener;
+
+import eu.kennytv.maintenance.api.proxy.Server;
+import eu.kennytv.maintenance.core.listener.JoinListenerBase;
+import eu.kennytv.maintenance.core.proxy.MaintenanceProxyPlugin;
+import eu.kennytv.maintenance.core.proxy.SettingsProxy;
+import eu.kennytv.maintenance.core.proxy.util.ProxySenderInfo;
+import eu.kennytv.maintenance.core.proxy.util.ServerConnectResult;
+import eu.kennytv.maintenance.core.util.SenderInfo;
+
+public abstract class ProxyJoinListenerBase extends JoinListenerBase {
+    private static final ServerConnectResult ALLOWED = new ServerConnectResult(false);
+    private static final ServerConnectResult DENIED = new ServerConnectResult(true);
+    protected final MaintenanceProxyPlugin plugin;
+    protected final SettingsProxy settings;
+    private boolean warned;
+
+    protected ProxyJoinListenerBase(final MaintenanceProxyPlugin plugin, final SettingsProxy settings) {
+        super(plugin, settings);
+        this.plugin = plugin;
+        this.settings = settings;
+    }
+
+    /**
+     * @param sender              joined player
+     * @param target              target server
+     * @param normalServerConnect true if normal server connect, false if initial proxy join or kick
+     * @return connect result with data for further handling
+     */
+    protected ServerConnectResult serverConnect(final ProxySenderInfo sender, final Server target, final boolean normalServerConnect) {
+        // Check waiting server for global maintenance
+        if (settings.isMaintenance()) {
+            if (sender.hasMaintenancePermission("bypass") || settings.isWhitelisted(sender.getUuid())) return ALLOWED;
+
+            final Server waitingServer = shouldConnectToWaitingServer(sender);
+            // Should never be null, but just in case
+            if (waitingServer == null) return DENIED;
+
+            // Player is connecting to the waiting server
+            if (target.getName().equals(waitingServer.getName())) return ALLOWED;
+
+            // Player already is on the waiting server
+            final String currentServer = plugin.getServer(sender);
+            if (currentServer != null && currentServer.equals(waitingServer.getName())) {
+                sender.sendMessage(settings.getMessage("forceWaitingServer"));
+                return DENIED;
+            }
+
+            sender.sendMessage(settings.getMessage("sentToWaitingServer"));
+            return new ServerConnectResult(waitingServer);
+        }
+
+        // Single server maintenance
+        if (!settings.isMaintenance(target.getName())) return ALLOWED;
+        if (sender.hasMaintenancePermission("bypass") || settings.isWhitelisted(sender.getUuid())
+                || sender.hasMaintenancePermission("singleserver.bypass." + target.getName().toLowerCase())) {
+            return ALLOWED;
+        }
+
+        if (settings.isJoinNotifications()) {
+            broadcastJoinNotification(sender.getName(), target);
+        }
+
+        if (normalServerConnect) {
+            sender.sendMessage(settings.getMessage("singleMaintenanceKick").replace("%SERVER%", target.getName()));
+            return DENIED;
+        }
+
+        // If it's the initial proxy join or a kick from another server, go back to fallback server
+        final Server fallback = plugin.getServer(settings.getFallbackServer());
+        if (fallback == null || !sender.canAccess(fallback) || plugin.isMaintenance(fallback)) {
+            // Nothing to redirect to, player has to be kicked from the proxy
+            sender.disconnect(settings.getMessage("singleMaintenanceKickComplete").replace("%NEWLINE%", "\n").replace("%SERVER%", target.getName()));
+            if (!warned) {
+                plugin.getLogger().warning("Could not send player to the set fallback server; instead kicking player off the network!");
+                warned = true;
+            }
+            return DENIED;
+        } else {
+            return new ServerConnectResult(fallback);
+        }
+    }
+
+    /**
+     * To be called after {@link #shouldKick(SenderInfo, boolean)} to get the waiting server if present.
+     * Does not do any permission checks, they should be done separately!
+     *
+     * @param sender sender
+     * @return waiting server, null if player should be kicked
+     */
+    protected Server shouldConnectToWaitingServer(final ProxySenderInfo sender) {
+        if (settings.getWaitingServer() == null) return null;
+
+        final Server waitingServer = plugin.getServer(settings.getWaitingServer());
+        if (waitingServer == null) return null;
+        if (!sender.canAccess(waitingServer) || settings.isMaintenance(waitingServer.getName())) return null;
+
+        return waitingServer;
+    }
+
+    protected abstract void broadcastJoinNotification(String name, Server server);
+}

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/mysql/MySQL.java

@@ -8,19 +8,30 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.function.Consumer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public final class MySQL {
+    private final Logger logger;
     private final HikariDataSource hikariDataSource;
 
     // Excuse me and everything to do with the MySQL stuff, I have little to no idea of how to use databases
-    public MySQL(final String hostname, final int port, final String username, final String password, final String database) {
+    public MySQL(final Logger logger, final String hostname, final int port, final String username, final String password, final String database, final boolean useSSL) {
+        this.logger = logger;
+
         final HikariConfig hikariConfig = new HikariConfig();
         hikariConfig.setMaximumPoolSize(10);
         hikariConfig.addDataSourceProperty("serverName", hostname);
         hikariConfig.addDataSourceProperty("user", username);
         hikariConfig.addDataSourceProperty("password", password);
-        hikariConfig.addDataSourceProperty("url", "jdbc:mysql://" + hostname + ":" + port + "/" + database);
-        hikariConfig.setJdbcUrl("jdbc:mysql://" + hostname + ":" + port + "/" + database);
+
+        String urlProperty = "jdbc:mysql://" + hostname + ":" + port + "/" + database;
+        if (useSSL) {
+            urlProperty += "?useSSL=false";
+        }
+        hikariConfig.addDataSourceProperty("url", urlProperty);
+
+        hikariConfig.setJdbcUrl(urlProperty);
         hikariConfig.setDataSourceClassName("com.mysql.jdbc.jdbc2.optional.MysqlDataSource");
         hikariDataSource = new HikariDataSource(hikariConfig);
     }
@@ -37,7 +48,7 @@ public final class MySQL {
                 callback.accept(preparedStatement.executeUpdate());
             }
         } catch (final SQLException e) {
-            System.out.println("Error while executing update method: " + query);
+            logger.log(Level.SEVERE, "Error while executing update method: " + query);
             e.printStackTrace();
         }
     }
@@ -56,7 +67,7 @@ public final class MySQL {
                 resultSet.close();
             }
         } catch (final SQLException e) {
-            System.out.println("Error while executing query method: " + query);
+            logger.log(Level.SEVERE, "Error while executing query method: " + query);
             e.printStackTrace();
         }
     }

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/runnable/SingleMaintenanceRunnable.java

@@ -32,6 +32,11 @@ public final class SingleMaintenanceRunnable extends MaintenanceRunnableBase {
         this.server = server;
     }
 
+    @Override
+    protected void broadcast(final String message) {
+        server.broadcast(message);
+    }
+
     @Override
     protected void finish() {
         ((IMaintenanceProxy) plugin).setMaintenanceToServer(server, enable);

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/server/DummyServer.java

@@ -38,6 +38,6 @@ public final class DummyServer implements Server {
     }
 
     @Override
-    public void broadcast(String s) {
+    public void broadcast(final String s) {
     }
 }

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/util/ProxySenderInfo.java

@@ -0,0 +1,29 @@
+/*
+ * Maintenance - https://git.io/maintenancemode
+ * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package eu.kennytv.maintenance.core.proxy.util;
+
+import eu.kennytv.maintenance.api.proxy.Server;
+import eu.kennytv.maintenance.core.util.SenderInfo;
+
+public interface ProxySenderInfo extends SenderInfo {
+
+    boolean canAccess(Server server);
+
+    void disconnect(String message);
+}

maintenance-core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/util/ServerConnectResult.java

@@ -0,0 +1,44 @@
+/*
+ * Maintenance - https://git.io/maintenancemode
+ * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package eu.kennytv.maintenance.core.proxy.util;
+
+import eu.kennytv.maintenance.api.proxy.Server;
+
+public final class ServerConnectResult {
+    private final boolean cancel;
+    private final Server target;
+
+    public ServerConnectResult(final boolean cancel) {
+        this.cancel = cancel;
+        this.target = null;
+    }
+
+    public ServerConnectResult(final Server target) {
+        this.cancel = false;
+        this.target = target;
+    }
+
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    public Server getTarget() {
+        return target;
+    }
+}

maintenance-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.kennytv.maintenance</groupId>
         <artifactId>maintenance-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.0.4</version>
     </parent>
 
     <artifactId>maintenance-core</artifactId>

maintenance-core/src/main/java/eu/kennytv/maintenance/core/MaintenancePlugin.java

@@ -79,16 +79,22 @@ public abstract class MaintenancePlugin implements IMaintenance {
     }
 
     public void serverActions(final boolean maintenance) {
-        if (isTaskRunning())
+        if (isTaskRunning()) {
             cancelTask();
-        if (serverListPlusHook != null)
+        }
+        if (serverListPlusHook != null) {
             serverListPlusHook.setEnabled(!maintenance);
+        }
 
         if (maintenance) {
-            kickPlayers();
             broadcast(settings.getMessage("maintenanceActivated"));
-        } else
+            if (settings.isKickOnlinePlayers()) {
+                kickPlayers();
+            }
+        } else {
             broadcast(settings.getMessage("maintenanceDeactivated"));
+        }
+
         eventManager.callEvent(new MaintenanceChangedEvent(maintenance));
     }
 
@@ -154,7 +160,7 @@ public abstract class MaintenancePlugin implements IMaintenance {
                 getLogger().info("§cNewest version available: §aVersion " + newestVersion + "§c, you're on §a" + version);
             } else if (compare == 1) {
                 if (version.getTag().equalsIgnoreCase("snapshot")) {
-                    getLogger().info("§cYou're running a development version, please report bugs on the Discord server (https://kennytv.eu/discord) or the GitHub issue tracker (https://kennytv.eu/maintenance/issues)");
+                    getLogger().info("§cYou're running a development version, please report bugs on the Discord server (https://discord.gg/vGCUzHq) or the GitHub issue tracker (https://github.com/KennyTV/Maintenance/issues)");
                 } else {
                     getLogger().info("§cYou're running a version, that doesn't exist! §cN§ai§dc§ee§5!");
                 }
@@ -202,8 +208,9 @@ public abstract class MaintenancePlugin implements IMaintenance {
             final String newVersionString = reader.readLine();
             reader.close();
             final Version newVersion = new Version(newVersionString);
-            if (!newVersion.equals(version))
+            if (!newVersion.equals(version)) {
                 newestVersion = newVersion;
+            }
         } catch (final Exception ignored) {
         }
     }

maintenance-core/src/main/java/eu/kennytv/maintenance/core/Settings.java

@@ -31,7 +31,7 @@ import java.util.*;
 import java.util.logging.Level;
 
 public class Settings implements ISettings {
-    private static final int CURRENT_CONFIG_VERSION = 2;
+    private static final int CURRENT_CONFIG_VERSION = 4;
     private static final Random RANDOM = new Random();
     protected final MaintenancePlugin plugin;
     private final Map<UUID, String> whitelistedPlayers = new HashMap<>();
@@ -48,6 +48,7 @@ public class Settings implements ISettings {
     private boolean joinNotifications;
     private boolean updateChecks;
     private boolean saveEndtimerOnStop;
+    private boolean kickOnlinePlayers;
     private boolean debug;
     private long savedEndtimer;
 
@@ -89,6 +90,8 @@ public class Settings implements ISettings {
             throw new RuntimeException("Unable to load Maintenance language file!", e);
         }
 
+        updateLanguageFile();
+
         // Directly save colored messages
         for (final Map.Entry<String, Object> entry : language.getValues().entrySet()) {
             if (!(entry.getValue() instanceof String)) continue;
@@ -129,17 +132,19 @@ public class Settings implements ISettings {
     }
 
     private void createLanguageFile() {
-        final File file = new File(plugin.getDataFolder(), "language-" + languageName + ".yml");
-        if (!file.exists()) {
-            try (final InputStream in = plugin.getResource("language-" + languageName + ".yml")) {
-                Files.copy(in, file.toPath());
-            } catch (final IOException e) {
-                plugin.getLogger().warning("Unable to provide language " + languageName);
-                if (!languageName.equals("en")) {
-                    plugin.getLogger().warning("Falling back to default language: en");
-                    languageName = "en";
-                    createLanguageFile();
-                }
+        final String fileName = "language-" + languageName + ".yml";
+        final File file = new File(plugin.getDataFolder(), fileName);
+        if (file.exists()) return;
+
+        try (final InputStream in = plugin.getResource(fileName)) {
+            Files.copy(in, file.toPath());
+        } catch (final IOException e) {
+            plugin.getLogger().warning("Unable to provide language " + languageName);
+            // Fall back to English language (if not already selected)
+            if (!languageName.equals("en")) {
+                plugin.getLogger().warning("Falling back to default language: en");
+                languageName = "en";
+                createLanguageFile();
             }
         }
     }
@@ -148,34 +153,40 @@ public class Settings implements ISettings {
         updateConfig();
 
         pingMessages = config.getStringList("pingmessages");
-        if (config.getBoolean("enable-timerspecific-messages"))
+        if (config.getBoolean("enable-timerspecific-messages")) {
             timerSpecificPingMessages = config.getStringList("timerspecific-pingmessages");
+        }
         maintenance = config.getBoolean("maintenance-enabled");
         customPlayerCountMessage = config.getBoolean("enable-playercountmessage");
         customMaintenanceIcon = config.getBoolean("custom-maintenance-icon");
         joinNotifications = config.getBoolean("send-join-notification");
         broadcastIntervals = new HashSet<>(config.getIntList("timer-broadcast-for-seconds"));
-        if (plugin.getServerType() != ServerType.SPONGE)
+        if (plugin.getServerType() != ServerType.SPONGE) {
             playerCountMessage = getColoredString(getConfigString("playercountmessage"));
+        }
         playerCountHoverMessage = getColoredString(getConfigString("playercounthovermessage"));
         languageName = getConfigString("language").toLowerCase();
+        kickOnlinePlayers = config.getBoolean("kick-online-players", true);
         updateChecks = config.getBoolean("update-checks", true);
         debug = config.getBoolean("debug");
+
         final ConfigSection section = config.getSection("continue-endtimer-after-restart");
         saveEndtimerOnStop = section.getBoolean("enabled");
         savedEndtimer = section.getLong("end");
+
         if (customMaintenanceIcon) {
             plugin.loadMaintenanceIcon();
         }
 
         whitelistedPlayers.clear();
-        whitelist.getValues().forEach((key, value) -> {
+        for (final Map.Entry<String, Object> entry : whitelist.getValues().entrySet()) {
             try {
-                whitelistedPlayers.put(UUID.fromString(key), (String) value);
+                whitelistedPlayers.put(UUID.fromString(entry.getKey()), (String) entry.getValue());
             } catch (final Exception e) {
-                plugin.getLogger().warning("invalid WhitelistedPlayers entry: " + key);
+                plugin.getLogger().warning("invalid WhitelistedPlayers entry: " + entry.getKey());
             }
-        });
+        }
+
         loadExtraSettings();
     }
 
@@ -188,10 +199,11 @@ public class Settings implements ISettings {
             // Also rename old language file
             final File file = new File(plugin.getDataFolder(), "language-" + languageName + ".yml");
             if (file.exists()) {
-                if (file.renameTo(new File(plugin.getDataFolder(), "language-" + languageName + ".old")))
+                if (file.renameTo(new File(plugin.getDataFolder(), "language-" + languageName + ".old"))) {
                     plugin.getLogger().info("Renamed old language file!");
-                else
+                } else {
                     plugin.getLogger().warning("Could not rename old language file! Please rename/delete it yourself as soon as possible!");
+                }
             }
 
             changed = true;
@@ -203,10 +215,11 @@ public class Settings implements ISettings {
         // 3.0 - move maintenace-icon from server to plugin directory
         final File icon = new File("maintenance-icon.png");
         if (icon.exists()) {
-            if (icon.renameTo(new File(plugin.getDataFolder(), "maintenance-icon.png")))
+            if (icon.renameTo(new File(plugin.getDataFolder(), "maintenance-icon.png"))) {
                 plugin.getLogger().info("Moved maintenance-icon from server directory to the plugin's directory!");
-            else
+            } else {
                 plugin.getLogger().warning("Could not move maintenance-icon from server directory to the plugin's directory! Please do so yourself!");
+            }
         }
 
         // Update config to latest version (config version included since 3.0.1)
@@ -226,12 +239,48 @@ public class Settings implements ISettings {
 
             file.delete();
             tempConfig.clear();
+
             changed = true;
         }
 
         if (changed) {
             saveConfig();
-            plugin.getLogger().info("Done! Updated config(s) to the latest version!");
+            plugin.getLogger().info("Done! Updated config!");
+        }
+    }
+
+    private void updateLanguageFile() {
+        final String filePrefix = "language-" + languageName;
+        try {
+            createFile(filePrefix + "-new.yml", filePrefix + ".yml");
+        } catch (final NullPointerException e) {
+            plugin.getLogger().info("Not checking for updated language strings, since there is no " + filePrefix + ".yml in the resource files (if your file is self translated and up to date, you can ignore this).");
+            return;
+        } catch (final Exception e) {
+            plugin.getLogger().warning("Couldn't update language file, as the " + filePrefix + ".yml could not be loaded from the resource files!");
+            e.printStackTrace();
+            return;
+        }
+
+        final File file = new File(plugin.getDataFolder(), filePrefix + "-new.yml");
+        final Config tempConfig = new Config(file);
+        try {
+            tempConfig.load();
+        } catch (final IOException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        final boolean updated = language.addMissingFields(tempConfig.getValues(), tempConfig.getComments());
+        tempConfig.clear();
+        file.delete();
+        if (updated) {
+            try {
+                language.save();
+                plugin.getLogger().info("Updated language file!");
+            } catch (final IOException e) {
+                e.printStackTrace();
+            }
         }
     }
 
@@ -252,16 +301,17 @@ public class Settings implements ISettings {
             config.set("pingmessages", Arrays.asList(oldConfig.getString("pingmessage")));
         if (oldConfig.contains("enable-maintenance-mode"))
             config.set("maintenance-enabled", oldConfig.getBoolean("enable-maintenance-mode"));
-        config.getValues().entrySet().forEach(entry -> {
-            if (!oldConfig.contains(entry.getKey())) return;
+        for (final Map.Entry<String, Object> entry : config.getValues().entrySet()) {
+            if (!oldConfig.contains(entry.getKey())) continue;
             entry.setValue(oldConfig.get(entry.getKey()));
-        });
+        }
 
         oldConfig.clear();
-        if (!file.delete())
+        if (!file.delete()) {
             plugin.getLogger().warning("Could not delete old config file! Please delete it as soon as possible.");
-        else
+        } else {
             plugin.getLogger().info("Updated to new config file!");
+        }
         return true;
     }
 
@@ -278,16 +328,19 @@ public class Settings implements ISettings {
             return false;
         }
 
-        if (oldFile.contains("maintenance-on"))
+        if (oldFile.contains("maintenance-on")) {
             config.set("proxied-maintenance-servers", oldFile.getStringList("maintenance-on"));
-        if (oldFile.contains("fallback"))
+        }
+        if (oldFile.contains("fallback")) {
             config.set("fallback", oldFile.getString("fallback"));
+        }
 
         oldFile.clear();
-        if (!file.delete())
+        if (!file.delete()) {
             plugin.getLogger().warning("Could not delete old SpigotServers.yml file! Please delete it as soon as possible.");
-        else
+        } else {
             plugin.getLogger().info("Deleted old SpigotServers.yml file!");
+        }
         return true;
     }
 
@@ -350,10 +403,15 @@ public class Settings implements ISettings {
     @Deprecated
     @Override
     public boolean removeWhitelistedPlayer(final String name) {
-        final Map.Entry<UUID, String> entry = whitelistedPlayers.entrySet().stream().filter(e -> e.getValue().equalsIgnoreCase(name)).findAny().orElse(null);
-        if (entry == null) return false;
+        UUID uuid = null;
+        for (final Map.Entry<UUID, String> e : whitelistedPlayers.entrySet()) {
+            if (e.getValue().equalsIgnoreCase(name)) {
+                uuid = e.getKey();
+                break;
+            }
+        }
+        if (uuid == null) return false;
 
-        final UUID uuid = entry.getKey();
         whitelistedPlayers.remove(uuid);
         whitelist.remove(uuid.toString());
         saveWhitelistedPlayers();
@@ -374,6 +432,11 @@ public class Settings implements ISettings {
         return whitelistedPlayers;
     }
 
+    @Override
+    public boolean isWhitelisted(final UUID uuid) {
+        return whitelistedPlayers.containsKey(uuid);
+    }
+
     @Override
     public boolean isMaintenance() {
         return maintenance;
@@ -410,6 +473,10 @@ public class Settings implements ISettings {
         return timerSpecificPingMessages != null;
     }
 
+    public boolean isKickOnlinePlayers() {
+        return kickOnlinePlayers;
+    }
+
     public long getSavedEndtimer() {
         return savedEndtimer;
     }

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/CommandInfo.java

@@ -27,13 +27,14 @@ import java.util.List;
 
 public abstract class CommandInfo {
     protected final MaintenancePlugin plugin;
-    protected final String helpMessage;
+    private final String helpMessageKey;
     private final String permission;
 
-    protected CommandInfo(final MaintenancePlugin plugin, final String permission, final String helpMessage) {
+    protected CommandInfo(final MaintenancePlugin plugin, final String permission) {
         this.plugin = plugin;
         this.permission = permission;
-        this.helpMessage = helpMessage;
+        // Just take the class name as the language key
+        this.helpMessageKey = "help" + getClass().getSimpleName().replace("Command", "");
     }
 
     public boolean hasPermission(final SenderInfo sender) {
@@ -41,7 +42,7 @@ public abstract class CommandInfo {
     }
 
     public String getHelpMessage() {
-        return helpMessage;
+        return getMessage(helpMessageKey);
     }
 
     public List<String> getTabCompletion(final SenderInfo sender, final String[] args) {
@@ -60,7 +61,7 @@ public abstract class CommandInfo {
 
     protected boolean checkArgs(final SenderInfo sender, final String[] args, final int length) {
         if (args.length != length) {
-            sender.sendMessage(helpMessage);
+            sender.sendMessage(getHelpMessage());
             return true;
         }
         return false;

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/MaintenanceCommand.java

@@ -25,7 +25,6 @@ import eu.kennytv.maintenance.core.util.SenderInfo;
 import eu.kennytv.maintenance.core.util.ServerType;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 public abstract class MaintenanceCommand {
     protected final MaintenancePlugin plugin;
@@ -91,8 +90,17 @@ public abstract class MaintenanceCommand {
     public List<String> getSuggestions(final SenderInfo sender, final String[] args) {
         if (!sender.hasMaintenancePermission("command") || args.length == 0) return Collections.emptyList();
         final String s = args[0].toLowerCase();
-        if (args.length == 1)
-            return commandExecutors.entrySet().stream().filter(entry -> entry.getKey().startsWith(s) && entry.getValue().hasPermission(sender)).map(Map.Entry::getKey).collect(Collectors.toList());
+        if (args.length == 1) {
+            final List<String> list = new ArrayList<>();
+            for (final Map.Entry<String, CommandInfo> entry : commandExecutors.entrySet()) {
+                final String command = entry.getKey();
+                if (command.startsWith(s) && entry.getValue().hasPermission(sender)) {
+                    list.add(command);
+                }
+            }
+            return list;
+        }
+
         final CommandInfo info = commandExecutors.get(args[0]);
         return info != null && info.hasPermission(sender) ? info.getTabCompletion(sender, args) : Collections.emptyList();
     }

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/AbortTimerCommand.java

@@ -25,13 +25,13 @@ import eu.kennytv.maintenance.core.util.SenderInfo;
 public final class AbortTimerCommand extends CommandInfo {
 
     public AbortTimerCommand(final MaintenancePlugin plugin) {
-        super(plugin, "timer", "§6/maintenance aborttimer §7(If running, the current timer will be aborted)");
+        super(plugin, "timer");
     }
 
     @Override
     public void execute(final SenderInfo sender, final String[] args) {
         if (args.length != 1) {
-            sender.sendMessage(helpMessage);
+            sender.sendMessage(getHelpMessage());
             return;
         }
 

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/DumpCommand.java

@@ -28,7 +28,7 @@ public final class DumpCommand extends CommandInfo {
     private long lastDump;
 
     public DumpCommand(final MaintenancePlugin plugin) {
-        super(plugin, "dump", "§6/maintenance dump §7(Dumps some server information, used for bug reports)");
+        super(plugin, "dump");
     }
 
     @Override

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/EndtimerCommand.java

@@ -25,14 +25,14 @@ import eu.kennytv.maintenance.core.util.SenderInfo;
 public final class EndtimerCommand extends CommandInfo {
 
     public EndtimerCommand(final MaintenancePlugin plugin) {
-        super(plugin, "timer", "§6/maintenance endtimer <minutes> §7(After the given time in minutes, maintenance mode will be disabled)");
+        super(plugin, "timer");
     }
 
     @Override
     public void execute(final SenderInfo sender, final String[] args) {
         if (checkArgs(sender, args, 2)) return;
         if (plugin.getCommandManager().checkTimerArgs(sender, args[1])) {
-            sender.sendMessage(helpMessage);
+            sender.sendMessage(getHelpMessage());
             return;
         }
         if (!plugin.isMaintenance()) {

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/HelpCommand.java

@@ -23,20 +23,20 @@ import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.command.CommandInfo;
 import eu.kennytv.maintenance.core.util.SenderInfo;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public final class HelpCommand extends CommandInfo {
     private static final int COMMANDS_PER_PAGE = 8;
 
     public HelpCommand(final MaintenancePlugin plugin) {
-        super(plugin, null, "§6/maintenance help [page] §7(Shows this beautiful help window)");
+        super(plugin, null);
     }
 
     @Override
     public void execute(final SenderInfo sender, final String[] args) {
         if (args.length > 2) {
-            sender.sendMessage(helpMessage);
+            sender.sendMessage(getHelpMessage());
             return;
         }
 
@@ -44,7 +44,7 @@ public final class HelpCommand extends CommandInfo {
             sendUsage(sender);
         } else {
             if (!plugin.isNumeric(args[1])) {
-                sender.sendMessage(helpMessage);
+                sender.sendMessage(getHelpMessage());
                 return;
             }
 
@@ -59,7 +59,12 @@ public final class HelpCommand extends CommandInfo {
 
     public void sendUsage(final SenderInfo sender, final int page) {
         Preconditions.checkArgument(page > 0);
-        final List<String> commands = plugin.getCommandManager().getCommands().stream().filter(cmd -> cmd.hasPermission(sender)).map(CommandInfo::getHelpMessage).collect(Collectors.toList());
+        final List<String> commands = new ArrayList<>();
+        for (final CommandInfo cmd : plugin.getCommandManager().getCommands()) {
+            if (cmd.hasPermission(sender)) {
+                commands.add(cmd.getHelpMessage());
+            }
+        }
         if ((page - 1) * COMMANDS_PER_PAGE >= commands.size()) {
             sender.sendMessage(getMessage("helpPageNotFound"));
             return;
@@ -71,12 +76,15 @@ public final class HelpCommand extends CommandInfo {
         else
             filteredCommands = commands.subList((page - 1) * COMMANDS_PER_PAGE, page * COMMANDS_PER_PAGE);
 
-        final String header = "§8========[ §eMaintenance" + plugin.getServerType() + " §8| §e" + page + "/" + ((commands.size() + getDivide(commands.size())) / COMMANDS_PER_PAGE) + " §8]========";
+        final String header = getMessage("helpHeader").replace("%NAME%", "Maintenance" + plugin.getServerType())
+                .replace("%PAGE%", Integer.toString(page)).replace("%MAX%", Integer.toString((commands.size() + getDivide(commands.size())) / COMMANDS_PER_PAGE));
         sender.sendMessage("");
         sender.sendMessage(header);
-        filteredCommands.forEach(sender::sendMessage);
+        for (final String command : filteredCommands) {
+            sender.sendMessage(command);
+        }
         if (page * COMMANDS_PER_PAGE < commands.size())
-            sender.sendMessage("§7Use §b/maintenance help " + (page + 1) + " §7to get to the next help window.");
+            sender.sendMessage(getMessage("helpNextPage").replace("%PAGE%", Integer.toString(page + 1)));
         else
             sender.sendMessage("§8× §eVersion " + plugin.getVersion() + " §7by §bKennyTV");
         sender.sendMessage(header);

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/MotdCommand.java

@@ -28,7 +28,7 @@ import java.util.List;
 public final class MotdCommand extends CommandInfo {
 
     public MotdCommand(final MaintenancePlugin plugin) {
-        super(plugin, "motd", "§6/maintenance motd [timer] §7(Lists the currently set maintenance motds. If specifying 'timer', the timer motds are shown)");
+        super(plugin, "motd");
     }
 
     @Override
@@ -43,7 +43,7 @@ public final class MotdCommand extends CommandInfo {
 
             sendList(sender, getSettings().getTimerSpecificPingMessages());
         } else
-            sender.sendMessage(helpMessage);
+            sender.sendMessage(getHelpMessage());
     }
 
     private void sendList(final SenderInfo sender, final List<String> list) {

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/ReloadCommand.java

@@ -25,7 +25,7 @@ import eu.kennytv.maintenance.core.util.SenderInfo;
 public final class ReloadCommand extends CommandInfo {
 
     public ReloadCommand(final MaintenancePlugin plugin) {
-        super(plugin, "reload", "§6/maintenance reload §7(Reloads the config file, whitelist file and the server-icon)");
+        super(plugin, "reload");
     }
 
     @Override

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/RemoveMotdCommand.java

@@ -30,7 +30,7 @@ import java.util.List;
 public final class RemoveMotdCommand extends CommandInfo {
 
     public RemoveMotdCommand(final MaintenancePlugin plugin) {
-        super(plugin, "setmotd", "§6/maintenance removemotd [timer] <index> §7(Removes a maintenance motd. If using \"timer\" as an argument, a timerspecific pingmessage will be removed)");
+        super(plugin, "setmotd");
     }
 
     @Override
@@ -47,7 +47,7 @@ public final class RemoveMotdCommand extends CommandInfo {
         }
         if (checkArgs(sender, args, 2)) return;
         if (!plugin.isNumeric(args[1])) {
-            sender.sendMessage(helpMessage);
+            sender.sendMessage(getHelpMessage());
             return;
         }
 

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/SetMotdCommand.java

@@ -31,7 +31,7 @@ import java.util.List;
 public final class SetMotdCommand extends CommandInfo {
 
     public SetMotdCommand(final MaintenancePlugin plugin) {
-        super(plugin, "setmotd", "§6/maintenance setmotd [timer] <index> <1/2> <message> §7(Sets a motd for maintenance mode. If using \"timer\" as an argument, a timerspecific pingmessage will be set)");
+        super(plugin, "setmotd");
     }
 
     @Override
@@ -48,7 +48,7 @@ public final class SetMotdCommand extends CommandInfo {
             timerPingMessages = true;
         }
         if (args.length < 4 || !plugin.isNumeric(args[1])) {
-            sender.sendMessage(helpMessage);
+            sender.sendMessage(getHelpMessage());
             return;
         }
 

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/StarttimerCommand.java

@@ -25,14 +25,14 @@ import eu.kennytv.maintenance.core.util.SenderInfo;
 public final class StarttimerCommand extends CommandInfo {
 
     public StarttimerCommand(final MaintenancePlugin plugin) {
-        super(plugin, "timer", "§6/maintenance starttimer <minutes> §7(After the given time in minutes, maintenance mode will be enabled)");
+        super(plugin, "timer");
     }
 
     @Override
     public void execute(final SenderInfo sender, final String[] args) {
         if (checkArgs(sender, args, 2)) return;
         if (plugin.getCommandManager().checkTimerArgs(sender, args[1])) {
-            sender.sendMessage(helpMessage);
+            sender.sendMessage(getHelpMessage());
             return;
         }
         if (plugin.isMaintenance()) {

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/ToggleCommand.java

@@ -25,7 +25,7 @@ import eu.kennytv.maintenance.core.util.SenderInfo;
 public final class ToggleCommand extends CommandInfo {
 
     public ToggleCommand(final MaintenancePlugin plugin) {
-        super(plugin, "toggle", "§6/maintenance <on/off> §7(Enables/disables maintenance mode)");
+        super(plugin, "toggle");
     }
 
     @Override

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/UpdateCommand.java

@@ -26,7 +26,7 @@ import eu.kennytv.maintenance.core.util.ServerType;
 public final class UpdateCommand extends CommandInfo {
 
     public UpdateCommand(final MaintenancePlugin plugin) {
-        super(plugin, "update", "§6/maintenance update §7(Remotely downloads the newest version of the plugin onto your server)");
+        super(plugin, "update");
     }
 
     @Override

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/WhitelistAddCommand.java

@@ -29,7 +29,7 @@ import java.util.UUID;
 public final class WhitelistAddCommand extends CommandInfo {
 
     public WhitelistAddCommand(final MaintenancePlugin plugin) {
-        super(plugin, "whitelist.add", "§6/maintenance add <name/uuid> §7(Adds the player to the maintenance whitelist, so they can join the server even though maintenance is enabled)");
+        super(plugin, "whitelist.add");
     }
 
     @Override

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/WhitelistCommand.java

@@ -28,7 +28,7 @@ import java.util.UUID;
 public final class WhitelistCommand extends CommandInfo {
 
     public WhitelistCommand(final MaintenancePlugin plugin) {
-        super(plugin, "whitelist.list", "§6/maintenance whitelist §7(Shows all whitelisted players for the maintenance mode)");
+        super(plugin, "whitelist.list");
     }
 
     @Override
@@ -41,7 +41,9 @@ public final class WhitelistCommand extends CommandInfo {
         } else {
             sender.sendMessage(getMessage("whitelistedPlayers"));
             final String format = getMessage("whitelistedPlayersFormat");
-            players.forEach((key, value) -> sender.sendMessage(format.replace("%NAME%", value).replace("%UUID%", key.toString())));
+            for (final Map.Entry<UUID, String> entry : players.entrySet()) {
+                sender.sendMessage(format.replace("%NAME%", entry.getValue()).replace("%UUID%", entry.getKey().toString()));
+            }
             sender.sendMessage("");
         }
     }

maintenance-core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/WhitelistRemoveCommand.java

@@ -22,15 +22,15 @@ import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.command.CommandInfo;
 import eu.kennytv.maintenance.core.util.SenderInfo;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 public final class WhitelistRemoveCommand extends CommandInfo {
 
     public WhitelistRemoveCommand(final MaintenancePlugin plugin) {
-        super(plugin, "whitelist.remove", "§6/maintenance remove <name/uuid> §7(Removes the player from the maintenance whitelist)");
+        super(plugin, "whitelist.remove");
     }
 
     @Override
@@ -46,8 +46,15 @@ public final class WhitelistRemoveCommand extends CommandInfo {
 
     @Override
     public List<String> getTabCompletion(final SenderInfo sender, final String[] args) {
-        return args.length == 2 ? getSettings().getWhitelistedPlayers().values().stream()
-                .filter(name -> name.toLowerCase().startsWith(args[1])).collect(Collectors.toList()) : Collections.emptyList();
+        if (args.length != 2) return Collections.emptyList();
+
+        final List<String> list = new ArrayList<>();
+        for (final String name : getSettings().getWhitelistedPlayers().values()) {
+            if (name.toLowerCase().startsWith(args[1])) {
+                list.add(name);
+            }
+        }
+        return list;
     }
 
     private void removePlayerFromWhitelist(final SenderInfo sender, final String name) {

maintenance-core/src/main/java/eu/kennytv/maintenance/core/config/Config.java

@@ -96,8 +96,9 @@ public final class Config extends ConfigSection {
         Files.write(this.file.toPath(), bytes);
     }
 
-    public void addMissingFields(final Map<String, Object> fields, final Map<String, String[]> comments) {
+    public boolean addMissingFields(final Map<String, Object> fields, final Map<String, String[]> comments) {
         // Note: Only scans for the first two levels
+        boolean changed = false;
         for (final Map.Entry<String, Object> entry : fields.entrySet()) {
             final Object o = values.get(entry.getKey());
             if (o != null) {
@@ -108,14 +109,17 @@ public final class Config extends ConfigSection {
                 for (final Map.Entry<String, Object> deepEntry : ((Map<String, Object>) o2).entrySet()) {
                     if (deepMap.containsKey(deepEntry.getKey())) continue;
                     deepMap.put(deepEntry.getKey(), deepEntry.getValue());
+                    changed = true;
                 }
                 continue;
             }
 
             values.put(entry.getKey(), entry.getValue());
+            changed = true;
         }
 
         this.comments = new HashMap<>(comments);
+        return changed;
     }
 
     @Override
@@ -134,34 +138,12 @@ public final class Config extends ConfigSection {
         this.comments.remove(key);
     }
 
-    /**
-     * Convenience method, not further established as currently not necessary.
-     *
-     * @see #getSection(String)
-     * @deprecated this config is only made for a quite simple use, only goes one level deeper
-     */
-    @Deprecated
-    public Object getDeep(final String key) {
-        final String[] split = key.split("\\.", 2);
-        if (split.length != 2) return get(key);
-
-        final Object o = getObject(split[0]);
-        if (!(o instanceof Map)) return null;
-
-        final Map<String, Object> map = (Map<String, Object>) o;
-        return map.get(split[1]);
-    }
-
-    public ConfigSection getSection(final String key) {
-        final Object o = getObject(key);
-        return o instanceof Map ? new ConfigSection((Map<String, Object>) o) : null;
-    }
-
     private static Yaml createYaml() {
         final DumperOptions options = new DumperOptions();
         options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         options.setPrettyFlow(false);
         options.setIndent(2);
+        options.setWidth(10_000); // be sneaky because autobreak on read/save looks disgusting
         return new Yaml(options);
     }
 

maintenance-core/src/main/java/eu/kennytv/maintenance/core/config/ConfigSection.java

@@ -45,7 +45,8 @@ public class ConfigSection {
     }
 
     public <E> E get(final String key, final E def) {
-        return values.containsKey(key) ? (E) this.values.get(key) : def;
+        final Object o = this.values.get(key);
+        return o != null ? (E) o : def;
     }
 
     public Object getObject(final String key) {
@@ -53,14 +54,38 @@ public class ConfigSection {
     }
 
     public <E> E getOrSet(final String key, final E def) {
-        if (this.values.containsKey(key)) {
-            return (E) this.values.get(key);
+        final Object o = this.values.get(key);
+        if (o != null) {
+            return (E) o;
         } else {
             this.set(key, def);
             return def;
         }
     }
 
+    /**
+     * Convenience method, not further established as currently not necessary.
+     *
+     * @see #getSection(String)
+     * @deprecated this config is only made for a quite simple use, only goes one level deeper
+     */
+    @Deprecated
+    public Object getDeep(final String key) {
+        final String[] split = key.split("\\.", 2);
+        if (split.length != 2) return get(key);
+
+        final Object o = getObject(split[0]);
+        if (!(o instanceof Map)) return null;
+
+        final Map<String, Object> map = (Map<String, Object>) o;
+        return map.get(split[1]);
+    }
+
+    public ConfigSection getSection(final String key) {
+        final Object o = getObject(key);
+        return o instanceof Map ? new ConfigSection((Map<String, Object>) o) : null;
+    }
+
     public boolean contains(final String key) {
         return this.values.containsKey(key);
     }
@@ -93,12 +118,12 @@ public class ConfigSection {
     }
 
     public boolean getBoolean(final String key) {
-        final Object o = values.get(key);
-        return o instanceof Boolean && (boolean) o;
+        return getBoolean(key, false);
     }
 
     public boolean getBoolean(final String key, final boolean def) {
-        return values.containsKey(key) ? get(key) : def;
+        final Object o = values.get(key);
+        return o instanceof Boolean ? (boolean) o : def;
     }
 
     public String getString(final String key) {
@@ -106,34 +131,35 @@ public class ConfigSection {
     }
 
     public String getString(final String key, final String def) {
-        return values.containsKey(key) ? get(key) : def;
+        final Object o = get(key);
+        return o instanceof String ? (String) o : def;
     }
 
     public int getInt(final String key) {
-        final Object o = values.get(key);
-        return o instanceof Number ? ((Number) o).intValue() : 0;
+        return getInt(key, 0);
     }
 
     public int getInt(final String key, final int def) {
-        return values.containsKey(key) ? get(key) : def;
+        final Object o = values.get(key);
+        return o instanceof Number ? ((Number) o).intValue() : def;
     }
 
     public double getDouble(final String key) {
-        final Object o = values.get(key);
-        return o instanceof Number ? ((Number) o).doubleValue() : 0D;
+        return getDouble(key, 0D);
     }
 
-    public double getDouble(final String key, final long def) {
-        return values.containsKey(key) ? get(key) : def;
+    public double getDouble(final String key, final double def) {
+        final Object o = values.get(key);
+        return o instanceof Number ? ((Number) o).doubleValue() : def;
     }
 
     public long getLong(final String key) {
-        final Object o = values.get(key);
-        return o instanceof Number ? ((Number) o).longValue() : 0L;
+        return getLong(key, 0L);
     }
 
     public long getLong(final String key, final long def) {
-        return values.containsKey(key) ? get(key) : def;
+        final Object o = values.get(key);
+        return o instanceof Number ? ((Number) o).longValue() : def;
     }
 
     public List<String> getStringList(final String key) {

maintenance-core/src/main/java/eu/kennytv/maintenance/core/config/ConfigSerializer.java

@@ -35,44 +35,53 @@ import java.util.regex.Pattern;
 public final class ConfigSerializer {
 
     private static final String[] EMPTY = new String[0];
-    private static final int INDENT_UNIT = 2;
     private static final String PATH_SEPARATOR_STRING = ".";
     private static final String PATH_SEPARATOR_QUOTED = Pattern.quote(PATH_SEPARATOR_STRING);
+    private static final int INDENT_UNIT = 2;
 
     public static String serialize(final String header, final Map<String, Object> data, final Map<String, String[]> comments, final Yaml yaml) {
         if (data.isEmpty()) return yaml.dump(null);
 
         final String rawYaml = yaml.dump(data);
         final StringBuilder fileData = new StringBuilder();
-        int currentIndents = 0;
+        int currentKeyIndents = 0;
         String key = "";
         for (final String line : rawYaml.split("\n")) {
             if (line.isEmpty()) continue;
 
             final int indent = getIndents(line);
             final int indents = indent / INDENT_UNIT;
-
-            final String indentText = indent > 0 ? line.substring(0, indent) : "";
-            if (indents <= currentIndents) {
+            final boolean keyLine;
+            final String substring = line.substring(indent);
+            if (substring.trim().isEmpty() || substring.charAt(0) == '-') {
+                keyLine = false;
+            } else if (indents <= currentKeyIndents) {
                 final String[] array = key.split(PATH_SEPARATOR_QUOTED);
-                final int backspace = currentIndents - indents + 1;
+                final int backspace = currentKeyIndents - indents + 1;
                 key = join(array, array.length - backspace);
+                keyLine = true;
+            } else {
+                keyLine = line.contains(":");
             }
 
-            final String separator = key.isEmpty() ? "" : PATH_SEPARATOR_STRING;
-            final String lineKey = line.contains(":") ? line.split(Pattern.quote(":"))[0] : line;
-            key += separator + lineKey.substring(indent);
+            if (keyLine) {
+                final String newKey = substring.split(Pattern.quote(":"))[0]; // Not sure about the quote thing, so I'll just keep it :aaa:
+                if (!key.isEmpty())
+                    key += PATH_SEPARATOR_STRING;
+                key += newKey;
 
-            currentIndents = indents;
-
-            final String[] strings = comments.get(key);
-            if (strings != null) {
-                for (final String comment : strings) {
-                    if (comment.isEmpty())
-                        fileData.append('\n');
-                    else
-                        fileData.append(indentText).append(comment).append('\n');
+                final String[] strings = comments.get(key);
+                if (strings != null) {
+                    final String indentText = indent > 0 ? line.substring(0, indent) : "";
+                    for (final String comment : strings) {
+                        if (comment.isEmpty())
+                            fileData.append('\n');
+                        else
+                            fileData.append(indentText).append(comment).append('\n');
+                    }
                 }
+
+                currentKeyIndents = indents;
             }
 
             fileData.append(line).append('\n');

maintenance-core/src/main/java/eu/kennytv/maintenance/core/event/EventManager.java

@@ -37,7 +37,10 @@ public final class EventManager implements IEventManager {
 
     public void callEvent(final MaintenanceEvent event) {
         final List<EventListener> list = listeners.get(event.getClass().getSimpleName());
-        if (list != null)
-            list.forEach(listener -> listener.onEvent(event));
+        if (list != null) {
+            for (final EventListener listener : list) {
+                listener.onEvent(event);
+            }
+        }
     }
 }

maintenance-core/src/main/java/eu/kennytv/maintenance/core/listener/JoinListenerBase.java

@@ -43,19 +43,19 @@ public abstract class JoinListenerBase {
      * @param sender wrapper of the joining player
      * @return true if the sender should be kicked
      */
-    protected boolean kickPlayer(final SenderInfo sender, final boolean updateCheck) {
-        if (settings.isMaintenance() && !sender.hasMaintenancePermission("bypass") && !settings.getWhitelistedPlayers().containsKey(sender.getUuid())) {
-            if (settings.isJoinNotifications())
-                broadcastJoinNotification(sender.getName());
-            return true;
+    protected boolean shouldKick(final SenderInfo sender, final boolean updateCheck) {
+        if (!settings.isMaintenance() || sender.hasMaintenancePermission("bypass") || settings.isWhitelisted(sender.getUuid())) {
+            if (updateCheck) {
+                updateCheck(sender);
+            }
+            return false;
         }
-        if (updateCheck)
-            updateCheck(sender);
-        return false;
+
+        return true;
     }
 
-    protected boolean kickPlayer(final SenderInfo sender) {
-        return kickPlayer(sender, true);
+    protected boolean shouldKick(final SenderInfo sender) {
+        return shouldKick(sender, true);
     }
 
     protected void updateCheck(final SenderInfo sender) {

maintenance-core/src/main/java/eu/kennytv/maintenance/core/runnable/MaintenanceRunnableBase.java

@@ -42,10 +42,7 @@ public abstract class MaintenanceRunnableBase implements Runnable {
         if (seconds == 0) {
             finish();
         } else if (settings.getBroadcastIntervals().contains(seconds)) {
-            if (enable)
-                plugin.broadcast(startMessageKey());
-            else
-                plugin.broadcast(endMessageKey());
+            broadcast(enable ? startMessageKey() : endMessageKey());
         }
 
         seconds--;
@@ -82,6 +79,10 @@ public abstract class MaintenanceRunnableBase implements Runnable {
         return task;
     }
 
+    protected void broadcast(final String message) {
+        plugin.broadcast(message);
+    }
+
     protected abstract void finish();
 
     protected abstract String startMessageKey();

maintenance-core/src/main/resources/config.yml

@@ -22,6 +22,10 @@ proxied-maintenance-servers:
 # If the fallback server is not reachable/not set, they will just be kicked off the network.
 fallback: lobby
 
+# If maintenance is enabled globally, you can define a "waiting" lobby for players to be sent to instead of being kicked.
+# Leave this empty to disable.
+waiting-server: ""
+
 # The message shown in the multiplayer server list motd when maintenance is enabled.
 # If you put in multiple entries, one of them will be chosen randomly on every ping.
 # If running an endtimer, the time left can be displayed by including '%TIMER%' in a pingmessage (also works in playercount(-hover) message).
@@ -54,8 +58,12 @@ custom-maintenance-icon: false
 # that a player tried to join the server while maintenance is enabled.
 send-join-notification: false
 
+# Set this to false if you do not want players to be kicked when you enable maintenance (new connections will still be blocked).
+# ... I don't know why you would want that, but you can disable it. :p
+kick-online-players: true
+
 # Changes the language of command feedback/messages.
-# Currently available are: en (English), de (German), fr (French), pt (Portuguese), es (Spanish)
+# Currently available are: en (English), de (German), fr (French), pt (Portuguese), es (Spanish), ru (Russian)
 language: en
 
 # If you have 2 or more proxy instances, the database connection will make sure all proxies
@@ -73,6 +81,8 @@ mysql:
   # Set this to 0 to make a database request on (almost) every single ping.
   # (0 is not recommended if having more than a hundred concurrent players, then I'd recommend keeping it from 10-60).
   update-interval: 15
+  # If you for some reason cannot establish SSL connections to your database, you may disable it here (not recommended).
+  use-ssl: true
 
 # If enabled and the server is restarted while running an endtimer, the timer will be continued after the restart.
 # If the timer ends while the server is offline, maintenance will be disabled as soon as the server starts again.
@@ -91,4 +101,4 @@ timer-broadcast-for-seconds: [1200, 900, 600, 300, 120, 60, 30, 20, 10, 5, 4, 3,
 update-checks: true
 
 # Used for autoupdating the config, do not change this value.
-config-version: 2
+config-version: 4

maintenance-core/src/main/resources/language-de.yml

@@ -7,7 +7,6 @@ maintenanceActivated: "&8[&eMaintenance&8] &6Der Wartungsmodus ist nun aktiviert
 maintenanceDeactivated: "&8[&eMaintenance&8] &6Der Wartungsmodus ist nun deaktiviert."
 alreadyEnabled: "&8[&eMaintenance&8] &cDer Wartungsmodus ist bereits aktiviert!"
 alreadyDisabled: "&8[&eMaintenance&8] &cDer Wartungsmodus ist bereits deaktiviert!"
-helpPageNotFound: "&8[&eMaintenance&8] &cEs gibt keine Seite mit dieser Nummer!"
 endtimerBroadcast: "&8[&eMaintenance&8] &7Der Wartungsmodus wird deaktiviert in: &6%TIME%&7."
 endtimerStarted: "&8[&eMaintenance&8] &aGestarteter Timer: &7Der Wartungsmodus wird deaktiviert in: &6%TIME%&7."
 starttimerBroadcast: "&8[&eMaintenance&8] &7Der Wartungsmodus wird aktiviert in: &6%TIME%&7."
@@ -43,15 +42,11 @@ playerNotFoundUuid: "&8[&eMaintenance&8] &cEs konnte kein Spieler mit dieser UUI
 playerNotOnline: "&8[&eMaintenance&8] &cEs ist momentan kein Spieler mit diesem Namen online."
 invalidUuid: "&8[&eMaintenance&8] &cUngültiges UUID Format!"
 
-second: "Sekunde"
-seconds: "Sekunden"
-minute: "Minute"
-minutes: "Minuten"
-hour: "Stunde"
-hours: "Stunden"
-
-# Nachrichten für den Bungee Teil des Plugins, einfach ignorieren, falls das Plugin auf Spigot verwendet wird
+# Nachrichten für den Bungee/Velocity Teil des Plugins, einfach ignorieren, falls das Plugin auf Spigot/Sponge verwendet wird
+sentToWaitingServer: "&8[&eMaintenance&8] &cDu wurdest auf den Warteserver verbunden!"
+forceWaitingServer: "&8[&eMaintenance&8] &cDu kannst den Warteserver nicht verlassen solange der Wartungsmodus aktiviert ist!"
 serverNotFound: "&8[&eMaintenance&8] &cEs wurde kein Server mit diesem Namen gefunden!"
+
 singleTimerAlreadyRunning: "&8[&eMaintenance&8] &cMomentan läuft bereits ein Timer auf diesem Server!"
 singleTimerNotRunning: "&8[&eMaintenance&8] &cMomentan läuft kein Timer auf diesem Server."
 singleTimerCancelled: "&8[&eMaintenance&8] &cDer laufende Timer dieses Servers wurde beendet."
@@ -64,4 +59,36 @@ singleMaintenanceDeactivated: "&8[&eMaintenance&8] &6Der Wartungsmodus wurde auf
 singleServerAlreadyEnabled: "&8[&eMaintenance&8] &cDer Wartungsmodus ist bereits an auf &e%SERVER%&c!"
 singleServerAlreadyDisabled: "&8[&eMaintenance&8] &cDer Wartungsmodus ist bereits aus auf &e%SERVER%&c!"
 singleServerMaintenanceList: "&8[&eMaintenance&8] &7Unterserver, die im Wartungsmodus sind:"
-singleServerMaintenanceListEmpty: "&8[&eMaintenance&8] &7Es befindet sich momentan kein Unterserver im Wartungsmodus."
+singleServerMaintenanceListEmpty: "&8[&eMaintenance&8] &7Es befindet sich momentan kein Unterserver im Wartungsmodus."
+
+second: "Sekunde"
+seconds: "Sekunden"
+minute: "Minute"
+minutes: "Minuten"
+hour: "Stunde"
+hours: "Stunden"
+
+helpHeader: "&8========[ &e%NAME% &8| &e%PAGE%/%MAX% &8]========"
+helpPageNotFound: "&8[&eMaintenance&8] &cEs gibt keine Seite mit dieser Nummer!"
+helpNextPage: "&7Nutze &b/maintenance help %SEITE%&7, um zur nächsten Hilfeseite zu kommen."
+helpAbortTimer: "&6/maintenance aborttimer &7(Falls momentan ein Timer läuft, wird dieser abgebrochen)"
+helpEndtimer: "&6/maintenance endtimer <Minuten> &7(Sobald der Timer abläuft wird der Wartungsmodus deaktiviert)"
+helpStarttimer: "&6/maintenance starttimer <minutes> &7(Sobald der Timer abläuft wird der Wartungsmodus aktiviert)"
+helpDump: "&6/maintenance dump &7(Sammelt wichtige Informationen für Bugreports)"
+helpHelp: "&6/maintenance help [Seite] &7(Zeigt diese wunderschöne Hilfe)"
+helpMotd: "&6/maintenance motd [timer] &7(Zeigt die momentan gesetzten Maintenance Motds an. Mit dem 'timer' Argument werden die timerspezifischen Motds angezeigt)"
+helpRemoveMotd: "&6/maintenance removemotd [timer] <Index> &7(Entfernt eine Maintenance Motd. Mit dem 'timer' Argument wird eine timerspezifischen Motd entfernt)"
+helpSetMotd: "&6/maintenance setmotd [timer] <Index> <1/2> <Nachricht> &7(Setzte eine Motd für den Wartungsmodus. Mit dem 'timer' Argument as an argument wird eine timerspezifische Motd gesetzt)"
+helpReload: "&6/maintenance reload &7(Lädt Config, Language und Whitelist Dateien sowie das Maintenance Icon neu)"
+helpToggle: "&6/maintenance <on/off> &7(Aktiviert/deaktiviert den Wartungsmodus)"
+helpUpdate: "&6/maintenance update &7(Sucht nach neuen Updates für das Plugin und lädt diese auf den Server)"
+helpWhitelist: "&6/maintenance whitelist &7(Zeigt alle gewhitelisteten Spieler für den Wartungsmodus an)"
+helpWhitelistAdd: "&6/maintenance add <Name/UUID> &7(Whitelistet einen Spieler für den Wartungsmodus, sodass dieser während Wartungen den Server betreten kann)"
+helpWhitelistRemove: "&6/maintenance remove <Name/UUID> &7(Entfernt einen Spieler aus der Wartungsmodus Whitelist)"
+
+# Nachrichten für den Bungee/Velocity Teil des Plugins, einfach ignorieren, falls das Plugin auf Spigot/Sponge verwendet wird
+helpAbortSingleTimer: "&6/maintenance aborttimer [Server] &7(Falls momentan ein Timer läuft, wird dieser abgebrochen)"
+helpSingleEndtimer: "&6/maintenance endtimer [Server] <Minuten> &7(Sobald der Timer abläuft wird der Wartungsmodus deaktiviert)"
+helpSingleStarttimer: "&6/maintenance starttimer [Server] <Minuten> &7(Sobald der Timer abläuft wird der Wartungsmodus aktiviert)"
+helpSingleToggle: "&6/maintenance <on/off> [Server] &7(Aktiviert/deaktiviert den Wartungsmodus)"
+helpStatus: "&6/maintenance status &7(Zeigt alle Server an, auf denen momentan der Wartungsmodus aktiviert ist)"

maintenance-core/src/main/resources/language-en.yml

@@ -7,7 +7,6 @@ maintenanceActivated: "&8[&eMaintenance&8] &6Maintenance mode is now activated."
 maintenanceDeactivated: "&8[&eMaintenance&8] &6Maintenance mode is now deactivated."
 alreadyEnabled: "&8[&eMaintenance&8] &cMaintenance is already enabled!"
 alreadyDisabled: "&8[&eMaintenance&8] &cMaintenance is already disabled!"
-helpPageNotFound: "&8[&eMaintenance&8] &cThere is no page with that number!"
 endtimerBroadcast: "&8[&eMaintenance&8] &7Maintenance mode will be disabled in &6%TIME%&7."
 endtimerStarted: "&8[&eMaintenance&8] &aStarted timer: &7Maintenance mode will be deactivated in &6%TIME%&7."
 starttimerBroadcast: "&8[&eMaintenance&8] &7Maintenance mode will be enabled in &6%TIME%&7."
@@ -43,15 +42,11 @@ playerNotFoundUuid: "&8[&eMaintenance&8] &cNo player with that uuid could be fou
 playerNotOnline: "&8[&eMaintenance&8] &cThere is no player online with that name."
 invalidUuid: "&8[&eMaintenance&8] &cInvalid uuid format!"
 
-second: "second"
-seconds: "seconds"
-minute: "minute"
-minutes: "minutes"
-hour: "hour"
-hours: "hours"
-
-# Some messages for the Bungee part, just ignore them if you use the plugin on Spigot
+# Messages for the Bungee/Velocity part, just can ignore them if you use the plugin on Spigot/Sponge
+sentToWaitingServer: "&8[&eMaintenance&8] &cYou have been sent to a waiting server!"
+forceWaitingServer: "&8[&eMaintenance&8] &cYou cannot leave the waiting server while maintenance is enabled!"
 serverNotFound: "&8[&eMaintenance&8] &cNo server with this name is registered on the proxy!"
+
 singleTimerAlreadyRunning: "&8[&eMaintenance&8] &cThere is already a timer scheduled for that server!"
 singleTimerCancelled: "&8[&eMaintenance&8] &cThe current timer for server &e%SERVER% &chas been disabled."
 singleTimerNotRunning: "&8[&eMaintenance&8] &cThere is currently no running timer for that server."
@@ -64,4 +59,36 @@ singleMaintenanceDeactivated: "&8[&eMaintenance&8] &6Maintenance mode is now dea
 singleServerAlreadyEnabled: "&8[&eMaintenance&8] &cMaintenance is already enabled on server &e%SERVER%&c!"
 singleServerAlreadyDisabled: "&8[&eMaintenance&8] &cMaintenance is already disabled on server &e%SERVER%&c!"
 singleServerMaintenanceList: "&8[&eMaintenance&8] &7Proxied servers, that have maintenance enabled:"
-singleServerMaintenanceListEmpty: "&8[&eMaintenance&8] &7There are no proxied servers that are under maintenance."
+singleServerMaintenanceListEmpty: "&8[&eMaintenance&8] &7There are no proxied servers that are under maintenance."
+
+second: "second"
+seconds: "seconds"
+minute: "minute"
+minutes: "minutes"
+hour: "hour"
+hours: "hours"
+
+helpHeader: "&8========[ &e%NAME% &8| &e%PAGE%/%MAX% &8]========"
+helpPageNotFound: "&8[&eMaintenance&8] &cThere is no page with that number!"
+helpNextPage: "&7Use &b/maintenance help %PAGE% &7to get to the next help window."
+helpAbortTimer: "&6/maintenance aborttimer &7(If running, the current timer will be aborted)"
+helpEndtimer: "&6/maintenance endtimer <minutes> &7(After the given time in minutes, maintenance mode will be disabled)"
+helpStarttimer: "&6/maintenance starttimer <minutes> &7(After the given time in minutes, maintenance mode will be enabled)"
+helpDump: "&6/maintenance dump &7(Dumps some server information, used for bug reports)"
+helpHelp: "&6/maintenance help [page] &7(Shows this beautiful help window)"
+helpMotd: "&6/maintenance motd [timer] &7(Lists the currently set maintenance motds. If specifying 'timer', the timer motds are shown)"
+helpRemoveMotd: "&6/maintenance removemotd [timer] <index> &7(Removes a maintenance motd. If using 'timer' as an argument, a timerspecific pingmessage will be removed)"
+helpSetMotd: "&6/maintenance setmotd [timer] <index> <1/2> <message> &7(Sets a motd for maintenance mode. If using 'timer' as an argument, a timerspecific pingmessage will be set)"
+helpReload: "&6/maintenance reload &7(Reloads the config file, whitelist file and the server-icon)"
+helpToggle: "&6/maintenance <on/off> &7(Enables/disables maintenance mode)"
+helpUpdate: "&6/maintenance update &7(Remotely downloads the newest version of the plugin onto your server)"
+helpWhitelist: "&6/maintenance whitelist &7(Shows all whitelisted players for the maintenance mode)"
+helpWhitelistAdd: "&6/maintenance add <name/uuid> &7(Adds the player to the maintenance whitelist, so they can join the server even though maintenance is enabled)"
+helpWhitelistRemove: "&6/maintenance remove <name/uuid> &7(Removes the player from the maintenance whitelist)"
+
+# Messages for the Bungee/Velocity part, just can ignore them if you use the plugin on Spigot/Sponge
+helpAbortSingleTimer: "&6/maintenance aborttimer [server] &7(If running, the current timer will be aborted)"
+helpSingleEndtimer: "&6/maintenance endtimer [server] <minutes> &7(After the given time in minutes, maintenance mode will be disabled)"
+helpSingleStarttimer: "&6/maintenance starttimer [server] <minutes> &7(After the given time in minutes, maintenance mode will be enabled)"
+helpSingleToggle: "&6/maintenance <on/off> [server] &7(Enables/disables maintenance mode)"
+helpStatus: "&6/maintenance status &7(Lists all proxied servers, that are currently under maintenance)"

maintenance-core/src/main/resources/language-es.yml

@@ -7,7 +7,6 @@ maintenanceActivated: "&8[&eMaintenance&8] &6Mantenimiento &7Activado"
 maintenanceDeactivated: "&8[&eMaintenance&8] &7Modo &6Mantenimiento &7Desactivado"
 alreadyEnabled: "&8[&eMaintenance&8] &7Modo &6Mantenimiento &7se encuentra Habilitado!"
 alreadyDisabled: "&8[&eMaintenance&8] &7Modo &6Mantenimiento &7se encuentra Deshabilitado!"
-helpPageNotFound: "&8[&eMaintenance&8] &7No hay pagina con ese número!"
 endtimerBroadcast: "&8[&eMaintenance&8] &7El Modo &6Mantenimiento &7se desactivara en &6%TIME%&7."
 endtimerStarted: "&8[&eMaintenance&8] &7Temporizador Iniciado: El Modo &6Mantenimiento &7se desactivará en &6%TIME%&7."
 starttimerBroadcast: "&8[&eMaintenance&8] &7El Modo &6Mantenimiento &7se habilitara en &6%TIME%&7."
@@ -16,12 +15,12 @@ timerAlreadyRunning: "&8[&eMaintenance&8] &7Ya hay un temporizador programado!"
 timerNotRunning: "&8[&eMaintenance&8] &7Actualmente no hay temporizador."
 timerCancelled: "&8[&eMaintenance&8] &cEl Temporizador actual ha sido deshabilitado."
 timerTooLong: "&8[&eMaintenance&8] &7El numero debe ser menor a 40320 &6(28 dias)"
-timerMotdDisabled: "&8[&eMaintenance&8] &cYou have to set 'enable-timerspecific-messages' in the config to 'true', if you want to use/edit timerspecific motds."
+timerMotdDisabled: "&8[&eMaintenance&8] &cTienes que configurar 'enable-timerspecific-messages' en la configuración en 'true', si quieres usar / editar motdspecers específicos."
 motdTimer: "%HOURS%:%MINUTES%:%SECONDS%"
 motdTimerNotRunning: "-"
 joinNotification: "&8[&eMaintenance&8] &c%PLAYER% &7Intenta unirse al servidor."
 motdList: "&8[&eMaintenance&8] &7Lista de motds de &6Mantenimiento&7:"
-motdListEmpty: "8[&eMaintenance&8] &cYou don't have any maintenance motds set!"
+motdListEmpty: "8[&eMaintenance&8] &c¡No tiene ningún juego de mantenimiento establecido!"
 reload: "&8[&eMaintenance&8] &aConfiguracion Recargada"
 removedMotd: "&8[&eMaintenance&8] &aNumero de Motd eliminado &6%INDEX%."
 removeMotdError: "&8[&eMaintenance&8] &Solo tienes un Motd, por lo que no puedes eliminar ninguno!"
@@ -43,15 +42,11 @@ playerNotFoundUuid: "&8[&eMaintenance&8] &cNo se pudo encontrar el jugador con e
 playerNotOnline: "&8[&eMaintenance&8] &7No hay jugador en línea con ese nombre."
 invalidUuid: "&8[&eMaintenance&8] &cFormato inválido!"
 
-second: "Segundo"
-seconds: "Segundos"
-minute: "Minuto"
-minutes: "Minutos"
-hour: "Hora"
-hours: "Horas"
-
-# Some messages for the Bungee part, just ignore them if you use the plugin on Spigot
+# Messages for the Bungee/Velocity part, just can ignore them if you use the plugin on Spigot/Sponge
+sentToWaitingServer: "&8[&eMaintenance&8] &cYou have been sent to a waiting server!"
+forceWaitingServer: "&8[&eMaintenance&8] &cYou cannot leave the waiting server while maintenance is enabled!"
 serverNotFound: "&8[&eMaintenance&8] &cNingún servidor con este nombre está registrado en el proxy!"
+
 singleTimerAlreadyRunning: "&8[&eMaintenance&8] &cYa hay un temporizador programado!"
 singleTimerNotRunning: "&8[&eMaintenance&8] &cActualmente no hay ningún temporizador en ejecución para ese servidor."
 singleTimerCancelled: "&8[&eMaintenance&8] &cEl temporizador actual para el servidor &6%SERVER% &c ha sido desactivado."
@@ -64,4 +59,36 @@ singleMaintenanceDeactivated: "&8[&eMaintenance&8] &7El Modo &6Mantenimiento &7A
 singleServerAlreadyEnabled: "&8[&eMaintenance&8] &7El Modo &6Mantenimiento &7se encuentra Habilitado en &6%SERVER%&7!"
 singleServerAlreadyDisabled: "&8[&eMaintenance&8] 7El Modo &6Mantenimiento &7se encuentra Deshabilitado en &6%SERVER%&7!"
 singleServerMaintenanceList: "&8[&eMaintenance&8] &7Servidores Proxy, que tienen habilitado el &6Mantenimiento:"
-singleServerMaintenanceListEmpty: "&8[&eMaintenance&8] &7No hay servidores Proxy que están en &6Mantenimiento&7."
+singleServerMaintenanceListEmpty: "&8[&eMaintenance&8] &7No hay servidores Proxy que están en &6Mantenimiento&7."
+
+second: "Segundo"
+seconds: "Segundos"
+minute: "Minuto"
+minutes: "Minutos"
+hour: "Hora"
+hours: "Horas"
+
+helpHeader: "&8========[ &e%NAME% &8| &e%PAGE%/%MAX% &8]========"
+helpPageNotFound: "&8[&eMaintenance&8] &7No hay pagina con ese número!"
+helpNextPage: "&7Utilice &b/maintenance help %PAGE% &7para pasar a la siguiente ventana de ayuda."
+helpAbortTimer: "&6/maintenance aborttimer &7(Si se ejecuta, se abortará el temporizador actual)"
+helpEndtimer: "&6/maintenance endtimer <minutes> &7(Después del tiempo en minutos, se desactivará el modo de mantenimiento)"
+helpStarttimer: "&6/maintenance starttimer <minutes> &7(Después del tiempo en minutos, se habilitará el modo de mantenimiento)"
+helpDump: "&6/maintenance dump &7(Vuelca información del servidor, usada para informes de errores)"
+helpHelp: "&6/maintenance help [page] &7(Muestra esta hermosa ventana de ayuda)"
+helpMotd: "&6/maintenance motd [timer] &7(Enumera los motivos de mantenimiento establecidos actualmente. Si se especifica el 'temporizador', se muestran los motivos del temporizador)"
+helpRemoveMotd: "&6/maintenance removemotd [timer] <index> &7(Elimina un mantenimiento motd. Si se usa 'timer' como argumento, se eliminará un pingmessage de temporizador específico)"
+helpSetMotd: "&6/maintenance setmotd [timer] <index> <1/2> <message> &7(Establece un motd para el modo de mantenimiento. Si usa 'timer' como argumento, se establecerá un mensaje de ping específico para el tiempo)"
+helpReload: "&6/maintenance reload &7(Vuelve a cargar el archivo de configuración, el archivo de la lista blanca y el ícono del servidor)"
+helpToggle: "&6/maintenance <on/off> &7(Habilita / deshabilita el modo de mantenimiento)"
+helpUpdate: "&6/maintenance update &7(Descarga de forma remota la versión más reciente del complemento en su servidor)"
+helpWhitelist: "&6/maintenance whitelist &7(Muestra todos los reproductores en lista blanca para el modo de mantenimiento)"
+helpWhitelistAdd: "&6/maintenance add <name/uuid> &7(Agrega el reproductor a la lista blanca de mantenimiento, para que puedan unirse al servidor aunque el mantenimiento esté habilitado)"
+helpWhitelistRemove: "&6/maintenance remove <name/uuid> &7(Quita el reproductor de la lista blanca de mantenimiento)"
+
+# Messages for the Bungee/Velocity part, just can ignore them if you use the plugin on Spigot/Sponge
+helpAbortSingleTimer: "&6/maintenance aborttimer [servidor] &7(Si está funcionando, se abortará el temporizador actual)"
+helpSingleEndtimer: "&6/maintenance endtimer [server] <minutes> &7(Después del tiempo en minutos, se desactivará el modo de mantenimiento)"
+helpSingleStarttimer: "&6/maintenance starttimer [server] <minutes> &7(Después del tiempo en minutos, el modo de mantenimiento habilitado)"
+helpSingleToggle: "&6/maintenance <on/off> [server] &7(Habilita / deshabilita el modo de mantenimiento)"
+helpStatus: "&6/maintenance status &7(Enumera todos los servidores proxy, que están actualmente en mantenimiento)"

maintenance-core/src/main/resources/language-fr.yml

@@ -7,7 +7,6 @@ maintenanceActivated: "&8[&eMaintenance&8] &6Le mode maintenance est maintenant
 maintenanceDeactivated: "&8[&eMaintenance&8] &6Le mode maintenance est maintenant désactivé."
 alreadyEnabled: "&8[&eMaintenance&8] &cLa maintenance est déjà activée!"
 alreadyDisabled: "&8[&eMaintenance&8] &cLa maintenance est déjà désactivée!"
-helpPageNotFound: "&8[&eMaintenance&8] &cIl n'y a pas cette page!"
 endtimerBroadcast: "&8[&eMaintenance&8] &7Le mode maintenance sera désactivé dans &6%TIME%&7."
 endtimerStarted: "&8[&eMaintenance&8] &aminuterie: &7Le mode maintenance sera désactivé dans &6%TIME%&7."
 starttimerBroadcast: "&8[&eMaintenance&8] &7MLe mode de maintenance sera activé dans &6%TIME%&7."
@@ -16,12 +15,12 @@ timerAlreadyRunning: "&8[&eMaintenance&8] &cIl y a déjà un horaire prévu!"
 timerNotRunning: "&8[&eMaintenance&8] &cIl n'y a actuellement aucune maintenance prévue."
 timerCancelled: "&8[&eMaintenance&8] &cLa minuterie actuelle a été désactivée."
 timerTooLong: "&8[&eMaintenance&8] &cLe nombre doit être inférieur à 40320 (28 jours)!"
-timerMotdDisabled: "&8[&eMaintenance&8] &c'enable-timerspecific-messages' dans la config doit être 'true' si vous voulez des motd minuterie spéficique."
+timerMotdDisabled: "&8[&eMaintenance&8] &cVous devez définir 'enable-timerspecific-messages' dans la configuration sur 'true', si vous voulez utiliser / éditer des timerspecific motd."
 motdTimer: "%HOURS%:%MINUTES%:%SECONDS%"
 motdTimerNotRunning: "-"
 joinNotification: "&8[&eMaintenance&8] &e%PLAYER% &ca essayé de rejoindre le serveur."
 motdList: "&8[&eMaintenance&8] &7Liste de vos motd pour la maintenance:"
-motdListEmpty: "8[&eMaintenance&8] &cVous n'avez pas ajoutéz de motd pour la maintenance!"
+motdListEmpty: "8[&eMaintenance&8] &cVous n'avez pas de motds d'entretien fixés!"
 reload: "&8[&eMaintenance&8] &afichier config, liste blanche (whitelist) joueurs, fichier de langue et l'icône de maintenance, recharger."
 removedMotd: "&8[&eMaintenance&8] &aNuméro de motd supprimé %INDEX%."
 removeMotdError: "&8[&eMaintenance&8] &cVous n’avez qu’un motd, vous ne pouvez donc en supprimer!"
@@ -43,15 +42,11 @@ playerNotFoundUuid: "&8[&eMaintenance&8] &cAucun joueur avec cet uuid n'a pu êt
 playerNotOnline: "&8[&eMaintenance&8] &cIl n'y a pas de joueur en ligne avec ce nom."
 invalidUuid: "&8[&eMaintenance&8] &cLe format de l'uuid est invalide!"
 
-second: "second"
-seconds: "seconds"
-minute: "minute"
-minutes: "minutes"
-hour: "heur"
-hours: "heurs"
-
-# Quelques messages pour la partie Bungee, ignorez-les si vous utilisez le plugin sur Spigot
+# Quelques messages pour la partie Bungee/Velocity, ignorez-les si vous utilisez le plugin sur Spigot/Sponge
+sentToWaitingServer: "&8[&eMaintenance&8] &cYou have been sent to a waiting server!"
+forceWaitingServer: "&8[&eMaintenance&8] &cYou cannot leave the waiting server while maintenance is enabled!"
 serverNotFound: "&8[&eMaintenance&8] &cAucun serveur avec ce nom n'est enregistré sur le proxy!"
+
 singleTimerAlreadyRunning: "&8[&eMaintenance&8] &cIl y a déjà un horaire prévu sur ce server!"
 singleTimerNotRunning: "&8[&eMaintenance&8] &cIl n'y a actuellement aucune maintenance prévue sur ce server."
 singleTimerCancelled: "&8[&eMaintenance&8] &cLa minuterie actuelle a été désactivée sur ce server."
@@ -64,4 +59,36 @@ singleMaintenanceDeactivated: "&8[&eMaintenance&8] &6La maintenance est maintena
 singleServerAlreadyEnabled: "&8[&eMaintenance&8] &cLa maintenance est déjà activée sur le serveur &e%SERVER%&c!"
 singleServerAlreadyDisabled: "&8[&eMaintenance&8] &cLa maintenance est déjà désactivée sur le serveur &e%SERVER%&c!"
 singleServerMaintenanceList: "&8[&eMaintenance&8] &7Serveurs proxy avec maintenance activée:"
-singleServerMaintenanceListEmpty: "&8[&eMaintenance&8] &7Il n'y a pas de serveurs proxy en maintenance."
+singleServerMaintenanceListEmpty: "&8[&eMaintenance&8] &7Il n'y a pas de serveurs proxy en maintenance."
+
+second: "second"
+seconds: "seconds"
+minute: "minute"
+minutes: "minutes"
+hour: "heur"
+hours: "heurs"
+
+helpHeader: "&8========[ &e%NAME% &8| &e%PAGE%/%MAX% &8]========"
+helpPageNotFound: "&8[&eMaintenance&8] &cIl n'y a pas cette page!"
+helpNextPage: "&7Utilisez &b/maintenance help %PAGE% &7pour accéder à la fenêtre d’aide suivante."
+helpAbortTimer: "&6/maintenance aborttimer &7(Si en cours d'exécution, le minuteur actuel sera abandonné)"
+helpEndtimer: "&6/maintenance endtimer <minutes> &7(Après le temps imparti en minutes, le mode maintenance sera désactivé)"
+helpStarttimer: "&6/maintenance starttimer <minutes> &7(Après le temps imparti en minutes, le mode maintenance sera activé)"
+helpDump: "&6/maintenance dump &7(Dépose certaines informations sur le serveur, utilisées pour les rapports de bug)"
+helpHelp: "&6/maintenance help [page] &7(Montre cette belle fenêtre d'aide)"
+helpMotd: "&6/maintenance motd [timer] &7(Répertorie les paramètres de maintenance actuellement définis. Si vous spécifiez 'timer', les mots de la minuterie sont affichés)"
+helpRemoveMotd: "&6/maintenance removemotd [timer] <index> &7(Supprime un motd de maintenance. Si vous utilisez 'timer' comme argument, un message ping spécifique au temporisateur sera supprimé)"
+helpSetMotd: "&6/maintenance setmotd [timer] <index> <1/2> <message> &7(Définit un motd pour le mode maintenance. Si vous utilisez 'timer' comme argument, un message ping spécifique à un temporisateur sera défini)"
+helpReload: "&6/maintenance reload &7(Recharge le fichier de configuration, le fichier de liste blanche et l'icône du serveur)"
+helpToggle: "&6/maintenance <on/off> &7(Active/désactive le mode maintenance)"
+helpUpdate: "&6/maintenance update &7(Télécharger la dernière version du plugin sur votre serveur)"
+helpWhitelist: "&6/maintenance whitelist &7(Affiche les joueurs de la liste blanche pour le mode maintenance)"
+helpWhitelistAdd: "&6/maintenance add <name/uuid> &7(Ajoute un joueur à la liste blanche de la maintenance afin qu'il puisse rejoindre le serveur même si la maintenance est activée)"
+helpWhitelistRemove: "&6/maintenance remove <name/uuid> &7(Supprime un joueur de la liste blanche de la maintenance)"
+
+# Quelques messages pour la partie Bungee/Velocity, ignorez-les si vous utilisez le plugin sur Spigot/Sponge
+helpAbortSingleTimer: "&6/maintenance aborttimer [server] &7(Si en cours d'exécution, le minuteur actuel sera abandonné)"
+helpSingleEndtimer: "&6/maintenance endtimer [server] <minutes> &7(Après le temps imparti en minutes, le mode maintenance sera désactivé)"
+helpSingleStarttimer: "&6/maintenance starttimer [server] <minutes> &7(Après le temps imparti en minutes, le mode maintenance sera activé)"
+helpSingleToggle: "&6/maintenance <on/off> [server] &7(Active/désactive le mode maintenance)"
+helpStatus: "&6/maintenance status &7(Répertorie tout les serveurs mandatés, actuellement en maintenance)"

maintenance-core/src/main/resources/language-pt.yml

@@ -7,7 +7,6 @@ maintenanceActivated: "&8[&cManutencao&8] &6Manutencao esta agora ativada!"
 maintenanceDeactivated: "&8[&cManutencao&8] &6Manutencao esta agora desativada!"
 alreadyEnabled: "&8[&cManutencao&8] &cManutencao ja esta ativada!"
 alreadyDisabled: "&8[&cManutencao&8] &cManutencao ja esta desativada!"
-helpPageNotFound: "&8[&eManutencao&8] &cNao existe nenhuma pagina com esse numero!"
 endtimerBroadcast: "&8[&cManutencao&8] &7Manutencao vai ser desativada em &6%TIME%&7"
 endtimerStarted: "&8[&cManutencao&8] &aTemporizador: &7Manutencao vai ser desativada em &6%TIME%&7"
 starttimerBroadcast: "&8[&cManutencao&8] &7Manutencao vai ser ativada em &6%TIME%&7"
@@ -16,19 +15,19 @@ timerAlreadyRunning: "&8[&cManutencao&8] &cO Timer ja esta a decorrer!"
 timerNotRunning: "&8[&cManutencao&8] &cO Timer nao esta a decorrer!"
 timerCancelled: "&8[&cManutencao&8] &cO Timer foi cancelado!"
 timerTooLong: "&8[&cManutencao&8] &cO numero tem de ser menor que 40320 (28 dias)!"
-timerMotdDisabled: "&8[&eMaintenance&8] &cYou have to set 'enable-timerspecific-messages' in the config to 'true', if you want to use/edit timerspecific motds."
+timerMotdDisabled: "&8[&eMaintenance&8] &cDefine 'enable-timerspecific-messages' no config a 'true', se queres definir/editar motds de manutenção."
 motdTimer: "%HOURS%:%MINUTES%:%SECONDS%"
 motdTimerNotRunning: "-"
 joinNotification: "&8[&cManutencao&8] &e%PLAYER% &ctentou entrar no servidor."
 motdList: "&8[&cManutencao&8] &7Lista de motds de manutencao:"
-motdListEmpty: "8[&eMaintenance&8] &cYou don't have any maintenance motds set!"
+motdListEmpty: "8[&eMaintenance&8] &cNão tens motds de manutenção!"
 reload: "&8[&cManutencao&8] &aReloaded config, whitelistedplayers, linguagem e icon de manutencao."
 removedMotd: "&8[&cManutencao&8] &aRemovida motd numero %INDEX%."
 removeMotdError: "&8[&cManutencao&8] &cSo tens uma motd, entao nao podes remover esta!"
 setMotd: "&8[&eManutencao&8] &aLinha %LINE% do %INDEX%. Motd de manutencao %MOTD%"
-setMotdIndexError: "&8[&cManutencao&8] §cTens atualmente %MOTDS% motds, entao escolhe um numero entre 1 e %NEWAMOUNT%."
+setMotdIndexError: "&8[&cManutencao&8] &cTens atualmente %MOTDS% motds, entao escolhe um numero entre 1 e %NEWAMOUNT%."
 setMotdLineError: "&8[&cManutencao&8] &cO segundo argumento tem de ser na linha (1 ou 2)!"
-updateDownloading: "&8[&cManutencao&8] &c&lDownloading update..."
+updateDownloading: "&8[&cManutencao&8] &c&lA dar download do update..."
 updateFailed: "&8[&cManutencao&8] &4&lUpdate falhado!"
 updateFinished: "&8[&cManutencao&8] &a&lO update foi feito com sucesso! Reinicia o servidor paa evitar erros e acabar a atualizacao"
 whitelistedPlayers: "&8[&cManutencao&8] &6Whitelisted players para a manutencao:"
@@ -43,15 +42,11 @@ playerNotFoundUuid: "&8[&cManutencao&8] &cNenhum player com esse uuid foi encont
 playerNotOnline: "&8[&cManutencao&8] &cNao esta ninguem online com esse nome"
 invalidUuid: "&8[&eMaintenance&8] &cFormato de uuid invalido!"
 
-second: "segundo"
-seconds: "segundos"
-minute: "minuto"
-minutes: "minutos"
-hour: "hora"
-hours: "horas"
-
-# Algumas mensagens para o Bungee, ignora-as se estas a usar Spigot
+# Algumas mensagens para o Bungee/Velocity, ignora-as se estas a usar Spigot/Sponge
+sentToWaitingServer: "&8[&eMaintenance&8] &cYou have been sent to a waiting server!"
+forceWaitingServer: "&8[&eMaintenance&8] &cYou cannot leave the waiting server while maintenance is enabled!"
 serverNotFound: "&8[&cManutencao&8] &cServidor nao encontrado!"
+
 singleTimerAlreadyRunning: "&8[&cManutencao&8] &cO Timer ja esta a decorrer!"
 singleTimerNotRunning: "&8[&cManutencao&8] &cO Timer nao esta a decorrer!"
 singleTimerCancelled: "&8[&cManutencao&8] &cO Timer foi cancelado no!"
@@ -64,4 +59,36 @@ singleMaintenanceDeactivated: "&8[&cManutencao&8] &6Manutencao esta agora desati
 singleServerAlreadyEnabled: "&8[&cManutencao&8] &cManutencao ja esta ativada no &e%SERVER%&c!"
 singleServerAlreadyDisabled: "&8[&cManutencao&8] &cManutencao ja esta desativada no &e%SERVER%&c!"
 singleServerMaintenanceList: "&8[&cManutencao&8] &7Servidores com manutencao ativa:"
-singleServerMaintenanceListEmpty: "&8[&cManutencao&8] &7Nao existem servidores com a manutencao ativa."
+singleServerMaintenanceListEmpty: "&8[&cManutencao&8] &7Nao existem servidores com a manutencao ativa."
+
+second: "segundo"
+seconds: "segundos"
+minute: "minuto"
+minutes: "minutos"
+hour: "hora"
+hours: "horas"
+
+helpHeader: "&8========[ &e%NAME% &8| &e%PAGE%/%MAX% &8]========"
+helpPageNotFound: "&8[&eManutencao&8] &cNao existe nenhuma pagina com esse numero!"
+helpNextPage: "&7Use &b/maintenance help %PAGE% &7para ir para a próxima págin."
+helpAbortTimer: "&6/maintenance aborttimer &7(Se estiver a correr o temporizador vai ser abortado)"
+helpEndtimer: "&6/maintenance endtimer <minutes> &7(Depois do temporizador acabar a manutenção vai ser desativada)"
+helpStarttimer: "&6/maintenance starttimer <minutes> &7(Depois do temporizador acabar a manutenção vai ser ativa)"
+helpDump: "&6/maintenance dump &7(Discarta alguma informação do server, usado para bugs)"
+helpHelp: "&6/maintenance help [page] &7(Mostra o help da manutenção)"
+helpMotd: "&6/maintenance motd [timer] &7(Lista as motd currentes. Se usar 'timer', os temporizadores vão ser mostrados)"
+helpRemoveMotd: "&6/maintenance removemotd [timer] <index> &7(Remove a motd da manutenção. Se usar \"timer\" como argumento uma mensagem com tempo vai ser eliminada)"
+helpSetMotd: "&6/maintenance setmotd [timer] <index> <1/2> <message> &7(Define a motd da manutenção. Se usar \"timer\" como argumento uma mensagem com tempo vai aparecer)"
+helpReload: "&6/maintenance reload &7(Dá reload ao plugin de manutenção)"
+helpToggle: "&6/maintenance <on/off> &7(Ativa/Desativa a manutenção)"
+helpUpdate: "&6/maintenance update &7(Arualiza o plugin de manutenção)"
+helpWhitelist: "&6/maintenance whitelist &7(Mostra os payers que estão na whitelist)"
+helpWhitelistAdd: "&6/maintenance add <name/uuid> &7(Adiciona o player à whitelist para poder entrar durante a manutenção)"
+helpWhitelistRemove: "&6/maintenance remove <name/uuid> &7(Remove o player da whitelist)"
+
+# Algumas mensagens para o Bungee/Velocity, ignora-as se estas a usar Spigot/Sponge
+helpAbortSingleTimer: "&6/maintenance aborttimer [server] &7(Se o timer estiver ativado este vai ser abortado)"
+helpSingleEndtimer: "&6/maintenance endtimer [server] <minutes> &7(Depois do tempo dado a manutenção vai ser desativada)"
+helpSingleStarttimer: "&6/maintenance starttimer [server] <minutes> &7(Depois do tempo dado a manutenção vai ser ativa)"
+helpSingleToggle: "&6/maintenance <on/off> [server] &7(Ativa/Desativa a manutenção)"
+helpStatus: "&6/maintenance status &7(Lista os servers em proxy que estão em manutenção)"

maintenance-core/src/main/resources/language-ru.yml

@@ -0,0 +1,94 @@
+# Maintenance Plugin by KennyTV
+# Don't remove words inbetween the '%' if you don't exactly know why you're doing it
+
+noPermission: "&cУ вас недостаточно прав!"
+kickmessage: "&cСервер закрыт на тех. работы!"
+maintenanceActivated: "&aРежим тех. работ включен!"
+maintenanceDeactivated: "&7Режим тех. работ выключен!"
+alreadyEnabled: "&cРежим тех. работ уже включен!"
+alreadyDisabled: "&cРежим тех. работ не был включен."
+endtimerBroadcast: "&aСервер будет открыт через &f%TIME% &aминут."
+endtimerStarted: "&aТаймер успешно запущен! &aСервер будет открыт через &f%TIME% &aминут."
+starttimerBroadcast: "&aСервер будет закрыт на тех. работы через &f%TIME% &aминут."
+starttimerStarted: "&aТаймер успешно запущен! &aСервер будет закрыт на тех. работы через &f%TIME% &aминут."
+timerAlreadyRunning: "&cТаймер уже запущен!"
+timerNotRunning: "&cТаймер не был запущен."
+timerCancelled: "&7Таймер был остановлен."
+timerTooLong: "&cЧисло должно быть не больше чем &f40320 &c(&f28 &cдней)."
+timerMotdDisabled: "&cСообщения по таймеру выключены в настройках плагина."
+motdTimer: "%HOURS%:%MINUTES%:%SECONDS%"
+motdTimerNotRunning: "-"
+joinNotification: "&cИгрок &f%PLAYER% &cпытался зайти на сервер."
+motdList: "&7Список титульных строк в режиме тех. работ:"
+motdListEmpty: "&cСписок пуст."
+reload: "&aПлагин успешно перезагружен!"
+removedMotd: "&aТитульная строка с индексом &f%INDEX% &aуспешно удалена!"
+removeMotdError: "&cВы не можете удалить последние 2 титульные строки."
+setMotd: "&aТитульная строка &f%LINE% &aс индексом &f%INDEX% &aуспешно изменена: &f%MOTD%"
+setMotdIndexError: "&cНеверный индекс, допустимые значения: 1 - %NEWAMOUNT%."
+setMotdLineError: "&cВторой аргумент должен быть номером строки (1 или 2)!"
+updateDownloading: "&aОбновление загружается..."
+updateFailed: "&cОбновление не удалось!"
+updateFinished: "&aОбновление успешно пройдено! Перезагрузите сервер, чтобы избежать возможных проблем."
+whitelistedPlayers: "&7Белый лист в режиме тех. работ:"
+whitelistedPlayersFormat: "&7- &f%NAME% &7(&f%UUID%&7)"
+whitelistAdded: "&aИгрок &f%PLAYER% &aуспешно добавлен в белый лист!"
+whitelistAlreadyAdded: "&cИгрок &f%PLAYER% &cуже в белом листе!"
+whitelistRemoved: "&aИгрок &f%PLAYER% &aуспешно удалён из белого листа!"
+whitelistNotFound: "&cДанный игрок не находится в белом листе!"
+whitelistEmpty: "&cБелый лист пуст! Используйте /maintenance add [игрок|uuid] чтобы добавить кого-нибудь."
+playerNotFound: "&cИгрок не найден!"
+playerNotFoundUuid: "&cИгрок с таким UUID не найден!"
+playerNotOnline: "&cИгрок должен быть онлайн!"
+invalidUuid: "&cНеверный формат UUID!"
+
+# Messages for the Bungee/Velocity part, just can ignore them if you use the plugin on Spigot/Sponge
+sentToWaitingServer: "&cYou have been sent to a waiting server!"
+forceWaitingServer: "&cYou cannot leave the waiting server while maintenance is enabled!"
+serverNotFound: "&cСервер не найден!"
+
+singleTimerAlreadyRunning: "&cТаймер сервера &f%SERVER% &cуже запущен!"
+singleTimerCancelled: "&7Таймер сервера &f%SERVER% &7был остановлен."
+singleTimerNotRunning: "&cТаймер сервера &f%SERVER% &cне был запущен."
+singleEndtimerBroadcast: "&aСервер &f%SERVER% &aбудет открыт через &f%TIME% &aминут."
+singleStarttimerBroadcast: "&cВнимание! Сервер &f%SERVER% &cбудет закрыт на тех. работы через &f%TIME%&c."
+singleMaintenanceKick: "&cДанный сервер закрыт на тех. работы! Попробуйте позже."
+singleMaintenanceKickComplete: "&cДанный сервер закрыт на тех. работы!%NEWLINE%&cПопробуйте позже."
+singleMaintenanceActivated: "&aРежим тех. работ на сервере &f%SERVER% &aвключен!"
+singleMaintenanceDeactivated: "&aРежим тех. работ на сервере &f%SERVER% &aвыключен!"
+singleServerAlreadyEnabled: "&cРежим тех. работ на сервере &f%SERVER% &cуже включен!"
+singleServerAlreadyDisabled: "&cРежим тех. работ на сервере &f%SERVER% &cне был включен."
+singleServerMaintenanceList: "&7Сервера на которых включен режим тех. работ:"
+singleServerMaintenanceListEmpty: "&7Сервера на которых включен режим тех. работ: &fпусто"
+
+second: "секунда"
+seconds: "секунд"
+minute: "минута"
+minutes: "минут"
+hour: "час"
+hours: "часов"
+
+helpHeader: "&7========[ &f%NAME% &7| &6%PAGE%&f/&6%MAX% &7]========"
+helpPageNotFound: "&cСтраница не найдена."
+helpNextPage: "&fИспользуйте &6/maintenance help %PAGE% &fчтобы перейти на следующую страницу."
+helpAbortTimer: "&6/maintenance aborttimer &7- &fОстановить таймер включения/выключения режима тех. работ."
+helpEndtimer: "&6/maintenance endtimer [время в минутах] &7- &fЗапустить таймер выключения режима тех. работ."
+helpStarttimer: "&6/maintenance starttimer [время в минутах] &7- &fЗапустить таймер включения режима тех. работ."
+helpDump: "&6/maintenance dump &7- &fСоздать дамп."
+helpHelp: "&6/maintenance help [страница] &7- &fОтобразить список доступных команд."
+helpMotd: "&6/maintenance motd <timer> &7- &fОтобразить список титульных сообщений."
+helpRemoveMotd: "&6/maintenance removemotd <timer> [индекс] &7- &fУдалить титульное сообщение."
+helpSetMotd: "&6/maintenance setmotd <timer> [индекс] [1|2] [сообщение] &7- &fДобавить новое титульное сообщение."
+helpReload: "&6/maintenance reload &7- &fПерезагрузить плагин."
+helpToggle: "&6/maintenance [on|off] &7- &fВключить/выключить режим тех. работ."
+helpUpdate: "&6/maintenance update &7- &fОбновить плагин."
+helpWhitelist: "&6/maintenance whitelist &7- &fОтобразить всех игроков из белого списка."
+helpWhitelistAdd: "&6/maintenance add [ник|uuid] &7- &fДобавить игрока в белый список."
+helpWhitelistRemove: "&6/maintenance remove [ник|uuid] &7- &fУдалить игрока из белого списка."
+
+# Messages for the Bungee/Velocity part, just can ignore them if you use the plugin on Spigot/Sponge
+helpAbortSingleTimer: "&6/maintenance aborttimer [сервер] &7- &fОстановить таймер включения/выключения режима тех. работ."
+helpSingleEndtimer: "&6/maintenance endtimer [сервер] [время в минутах] &7- &fЗапустить таймер выключения режима тех. работ."
+helpSingleStarttimer: "&6/maintenance starttimer [сервер] [время в минутах] &7- &fЗапустить таймер включения режима тех. работ."
+helpSingleToggle: "&6/maintenance [on|off] [сервер] &7- &fВключить/выключить режим тех. работы."
+helpStatus: "&6/maintenance status &7- &fСписок всех серверов закрытых на тех. работы."

maintenance-spigot/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.kennytv.maintenance</groupId>
         <artifactId>maintenance-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.0.4</version>
     </parent>
 
     <artifactId>maintenance-spigot</artifactId>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.13.2-R0.1-SNAPSHOT</version>
+            <version>1.15.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!-- Needed for backwards compatibility with Paper -->

maintenance-spigot/src/main/java/eu/kennytv/maintenance/spigot/MaintenanceSpigotPlugin.java

@@ -43,6 +43,7 @@ import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.util.CachedServerIcon;
@@ -68,7 +69,7 @@ public final class MaintenanceSpigotPlugin extends MaintenancePlugin {
         super(plugin.getDescription().getVersion(), ServerType.SPIGOT);
         this.plugin = plugin;
 
-        settings = new Settings(this, "mysql", "proxied-maintenance-servers", "fallback");
+        settings = new Settings(this, "mysql", "proxied-maintenance-servers", "fallback", "waiting-server");
 
         sendEnableMessage();
 
@@ -79,15 +80,13 @@ public final class MaintenanceSpigotPlugin extends MaintenancePlugin {
         final PluginManager pm = getServer().getPluginManager();
         pm.registerEvents(new PlayerLoginListener(this, settings), plugin);
 
-        if (isAcceptablePaper()) {
+        if (canUsePaperListener()) {
             pm.registerEvents(new PaperServerListPingListener(this, settings), plugin);
+        } else if (pm.isPluginEnabled("ProtocolLib")) {
+            pm.registerEvents(new ServerInfoPacketListener(this, plugin, settings), plugin);
         } else {
-            if (pm.isPluginEnabled("ProtocolLib")) {
-                pm.registerEvents(new ServerInfoPacketListener(this, plugin, settings), plugin);
-            } else {
-                pm.registerEvents(new ServerListPingListener(this, settings), plugin);
-                getLogger().warning("To use this plugin on Spigot to its full extend, you need the plugin ProtocolLib!");
-            }
+            pm.registerEvents(new ServerListPingListener(this, settings), plugin);
+            getLogger().warning("To use this plugin on Spigot to its full extend, you need the plugin ProtocolLib!");
         }
 
         continueLastEndtimer();
@@ -102,9 +101,14 @@ public final class MaintenanceSpigotPlugin extends MaintenancePlugin {
         }
     }
 
-    private boolean isAcceptablePaper() {
+    private boolean canUsePaperListener() {
         try {
             Class.forName("com.destroystokyo.paper.event.server.PaperServerListPingEvent");
+            if (getServer().getPluginManager().isPluginEnabled("ProtocolSupport")) {
+                getLogger().warning("Found ProtocolSupport - switching to ProtocolLib packet adapter, as PS does not fire Paper's ping event");
+                return false;
+            }
+
             return true;
         } catch (final ClassNotFoundException e) {
             return false;
@@ -157,9 +161,11 @@ public final class MaintenanceSpigotPlugin extends MaintenancePlugin {
 
     @Override
     protected void kickPlayers() {
-        getServer().getOnlinePlayers().stream()
-                .filter(p -> !hasPermission(p, "bypass") && !settings.getWhitelistedPlayers().containsKey(p.getUniqueId()))
-                .forEach(p -> p.kickPlayer(settings.getKickMessage()));
+        for (final Player p : getServer().getOnlinePlayers()) {
+            if (!hasPermission(p, "bypass") && !settings.isWhitelisted(p.getUniqueId())) {
+                p.kickPlayer(settings.getKickMessage());
+            }
+        }
     }
 
     @Override

maintenance-spigot/src/main/java/eu/kennytv/maintenance/spigot/command/MaintenanceSpigotCommand.java

@@ -46,40 +46,6 @@ public final class MaintenanceSpigotCommand extends MaintenanceCommand implement
         return true;
     }
 
-    /*@Override
-    protected void addPlayerToWhitelist(final SenderInfo sender, final String name) {
-        final Player selected = Bukkit.getOfflinePlayer(name);
-        if (selected != null) {
-            whitelistAddMessage(sender, new BukkitSenderInfo(selected));
-            return;
-        }
-
-        final OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(name);
-        if (!offlinePlayer.hasPlayedBefore()) {
-            sender.sendMessage(settings.getMessage("playerNotFound"));
-            return;
-        }
-
-        whitelistAddMessage(sender, new BukkitOfflinePlayerInfo(offlinePlayer));
-    }
-
-    @Override
-    protected void removePlayerFromWhitelist(final SenderInfo sender, final String name) {
-        final Player selected = Bukkit.getOfflinePlayer(name);
-        if (selected != null) {
-            whitelistRemoveMessage(sender, new BukkitSenderInfo(selected));
-            return;
-        }
-
-        final OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(name);
-        if (!offlinePlayer.hasPlayedBefore()) {
-            sender.sendMessage(settings.getMessage("playerNotFound"));
-            return;
-        }
-
-        whitelistRemoveMessage(sender, new BukkitOfflinePlayerInfo(offlinePlayer));
-    }*/
-
     @Override
     public List<String> onTabComplete(final CommandSender sender, final Command command, final String alias, final String[] args) {
         return getSuggestions(new BukkitSenderInfo(sender), args);

maintenance-spigot/src/main/java/eu/kennytv/maintenance/spigot/listener/PaperServerListPingListener.java

@@ -48,7 +48,7 @@ public final class PaperServerListPingListener implements Listener {
         event.setMotd(settings.getRandomPingMessage());
 
         if (settings.hasCustomPlayerCountMessage()) {
-            event.setProtocolVersion(0);
+            event.setProtocolVersion(-1);
             event.setVersion(settings.getPlayerCountMessage()
                     .replace("%ONLINE%", Integer.toString(plugin.getServer().getOnlinePlayers().size()))
                     .replace("%MAX%", Integer.toString(plugin.getServer().getMaxPlayers())));

maintenance-spigot/src/main/java/eu/kennytv/maintenance/spigot/listener/PlayerLoginListener.java

@@ -22,6 +22,7 @@ import eu.kennytv.maintenance.core.Settings;
 import eu.kennytv.maintenance.core.listener.JoinListenerBase;
 import eu.kennytv.maintenance.spigot.MaintenanceSpigotPlugin;
 import eu.kennytv.maintenance.spigot.util.BukkitSenderInfo;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerLoginEvent;
@@ -37,15 +38,21 @@ public final class PlayerLoginListener extends JoinListenerBase implements Liste
     @EventHandler
     public void postLogin(final PlayerLoginEvent event) {
         final BukkitSenderInfo sender = new BukkitSenderInfo(event.getPlayer());
-        if (kickPlayer(sender)) {
+        if (shouldKick(sender)) {
             event.setResult(PlayerLoginEvent.Result.KICK_OTHER);
             event.setKickMessage(settings.getKickMessage());
+            if (settings.isJoinNotifications()) {
+                broadcastJoinNotification(sender.getName());
+            }
         }
     }
 
     @Override
     protected void broadcastJoinNotification(final String name) {
-        plugin.getServer().getOnlinePlayers().stream().filter(p -> plugin.hasPermission(p, "joinnotification"))
-                .forEach(p -> p.sendMessage(settings.getMessage("joinNotification").replace("%PLAYER%", name)));
+        for (final Player p : plugin.getServer().getOnlinePlayers()) {
+            if (plugin.hasPermission(p, "joinnotification")) {
+                p.sendMessage(settings.getMessage("joinNotification").replace("%PLAYER%", name));
+            }
+        }
     }
 }

maintenance-spigot/src/main/java/eu/kennytv/maintenance/spigot/metrics/MetricsLite.java

@@ -1,16 +1,18 @@
 package eu.kennytv.maintenance.spigot.metrics;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.ServicePriority;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.*;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Timer;
@@ -19,11 +21,17 @@ import java.util.UUID;
 import java.util.logging.Level;
 import java.util.zip.GZIPOutputStream;
 
+/**
+ * bStats collects some data for plugin authors.
+ * <p>
+ * Check out https://bStats.org/ to learn more about bStats!
+ */
 public final class MetricsLite {
 
     public static final int B_STATS_VERSION = 1;
+    private static final int PLUGIN_ID = 2205;
     private static final String URL = "https://bStats.org/submitData/bukkit";
-    private boolean enabled;
+    private final boolean enabled;
     private static boolean logFailedRequests;
     private static boolean logSentData;
     private static boolean logResponseStatusText;
@@ -55,15 +63,15 @@ public final class MetricsLite {
             ).copyDefaults(true);
             try {
                 config.save(configFile);
-            } catch (IOException ignored) {
+            } catch (final IOException ignored) {
             }
         }
 
         serverUUID = config.getString("serverUuid");
         logFailedRequests = config.getBoolean("logFailedRequests", false);
+        enabled = config.getBoolean("enabled", true);
         logSentData = config.getBoolean("logSentData", false);
         logResponseStatusText = config.getBoolean("logResponseStatusText", false);
-        enabled = config.getBoolean("enabled", true);
         if (enabled) {
             boolean found = false;
             for (final Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
@@ -90,7 +98,7 @@ public final class MetricsLite {
         timer.scheduleAtFixedRate(new TimerTask() {
             @Override
             public void run() {
-                if (!plugin.isEnabled()) {
+                if (!plugin.isEnabled()) { // Plugin was disabled
                     timer.cancel();
                     return;
                 }
@@ -99,24 +107,25 @@ public final class MetricsLite {
         }, 1000 * 60 * 5, 1000 * 60 * 30);
     }
 
-    public JSONObject getPluginData() {
-        final JSONObject data = new JSONObject();
+    public JsonObject getPluginData() {
+        final JsonObject data = new JsonObject();
 
         final String pluginName = plugin.getDescription().getName();
         final String pluginVersion = plugin.getDescription().getVersion();
 
-        data.put("pluginName", pluginName);
-        data.put("pluginVersion", pluginVersion);
-        final JSONArray customCharts = new JSONArray();
-        data.put("customCharts", customCharts);
+        data.addProperty("pluginName", pluginName);
+        data.addProperty("id", PLUGIN_ID);
+        data.addProperty("pluginVersion", pluginVersion);
+        data.add("customCharts", new JsonArray());
 
         return data;
     }
 
-    private JSONObject getServerData() {
+    private JsonObject getServerData() {
         final int playerAmount = Bukkit.getOnlinePlayers().size();
         final int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
         final String bukkitVersion = Bukkit.getVersion();
+        final String bukkitName = Bukkit.getName();
 
         final String javaVersion = System.getProperty("java.version");
         final String osName = System.getProperty("os.name");
@@ -124,34 +133,53 @@ public final class MetricsLite {
         final String osVersion = System.getProperty("os.version");
         final int coreCount = Runtime.getRuntime().availableProcessors();
 
-        final JSONObject data = new JSONObject();
+        final JsonObject data = new JsonObject();
 
-        data.put("serverUUID", serverUUID);
+        data.addProperty("serverUUID", serverUUID);
 
-        data.put("playerAmount", playerAmount);
-        data.put("onlineMode", onlineMode);
-        data.put("bukkitVersion", bukkitVersion);
+        data.addProperty("playerAmount", playerAmount);
+        data.addProperty("onlineMode", onlineMode);
+        data.addProperty("bukkitVersion", bukkitVersion);
+        data.addProperty("bukkitName", bukkitName);
 
-        data.put("javaVersion", javaVersion);
-        data.put("osName", osName);
-        data.put("osArch", osArch);
-        data.put("osVersion", osVersion);
-        data.put("coreCount", coreCount);
+        data.addProperty("javaVersion", javaVersion);
+        data.addProperty("osName", osName);
+        data.addProperty("osArch", osArch);
+        data.addProperty("osVersion", osVersion);
+        data.addProperty("coreCount", coreCount);
 
         return data;
     }
 
     private void submitData() {
-        final JSONObject data = getServerData();
+        final JsonObject data = getServerData();
 
-        final JSONArray pluginData = new JSONArray();
+        final JsonArray pluginData = new JsonArray();
         for (final Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
             try {
                 service.getField("B_STATS_VERSION");
 
                 for (final RegisteredServiceProvider<?> provider : Bukkit.getServicesManager().getRegistrations(service)) {
                     try {
-                        pluginData.add(provider.getService().getMethod("getPluginData").invoke(provider.getProvider()));
+                        final Object plugin = provider.getService().getMethod("getPluginData").invoke(provider.getProvider());
+                        if (plugin instanceof JsonObject) {
+                            pluginData.add((JsonObject) plugin);
+                        } else {
+                            try {
+                                final Class<?> jsonObjectJsonSimple = Class.forName("org.json.simple.JSONObject");
+                                if (plugin.getClass().isAssignableFrom(jsonObjectJsonSimple)) {
+                                    final Method jsonStringGetter = jsonObjectJsonSimple.getDeclaredMethod("toJSONString");
+                                    jsonStringGetter.setAccessible(true);
+                                    final String jsonString = (String) jsonStringGetter.invoke(plugin);
+                                    final JsonObject object = new JsonParser().parse(jsonString).getAsJsonObject();
+                                    pluginData.add(object);
+                                }
+                            } catch (final ClassNotFoundException e) {
+                                if (logFailedRequests) {
+                                    this.plugin.getLogger().log(Level.SEVERE, "Encountered unexpected exception ", e);
+                                }
+                            }
+                        }
                     } catch (final NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
                     }
                 }
@@ -159,7 +187,7 @@ public final class MetricsLite {
             }
         }
 
-        data.put("plugins", pluginData);
+        data.add("plugins", pluginData);
 
         new Thread(() -> {
             try {
@@ -172,7 +200,7 @@ public final class MetricsLite {
         }).start();
     }
 
-    private static void sendData(final Plugin plugin, final JSONObject data) throws Exception {
+    private static void sendData(final Plugin plugin, final JsonObject data) throws Exception {
         if (data == null) {
             throw new IllegalArgumentException("Data cannot be null!");
         }
@@ -180,7 +208,7 @@ public final class MetricsLite {
             throw new IllegalAccessException("This method must not be called from the main thread!");
         }
         if (logSentData) {
-            plugin.getLogger().info("Sending data to bStats: " + data.toString());
+            plugin.getLogger().info("Sending data to bStats: " + data);
         }
         final HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
 
@@ -195,22 +223,19 @@ public final class MetricsLite {
         connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
 
         connection.setDoOutput(true);
-        final DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
-        outputStream.write(compressedData);
-        outputStream.flush();
-        outputStream.close();
+        try (final DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
+            outputStream.write(compressedData);
+        }
 
         if (logResponseStatusText) {
-            final InputStream inputStream = connection.getInputStream();
-            final BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
-
             final StringBuilder builder = new StringBuilder();
-            String line;
-            while ((line = bufferedReader.readLine()) != null) {
-                builder.append(line);
+            try (final BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+                String line;
+                while ((line = bufferedReader.readLine()) != null) {
+                    builder.append(line);
+                }
             }
-            bufferedReader.close();
-            plugin.getLogger().info("Sent data to bStats and received response: " + builder.toString());
+            plugin.getLogger().info("Sent data to bStats and received response: " + builder);
         } else {
             connection.getInputStream().close();
         }
@@ -221,10 +246,9 @@ public final class MetricsLite {
             return null;
         }
         final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        final GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
-        gzip.write(str.getBytes(StandardCharsets.UTF_8));
-        gzip.close();
+        try (final GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) {
+            gzip.write(str.getBytes(StandardCharsets.UTF_8));
+        }
         return outputStream.toByteArray();
     }
-
 }

maintenance-spigot/src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ version: ${project.version}
 main: eu.kennytv.maintenance.spigot.MaintenanceSpigotBase
 author: KennyTV
 description: Enable maintenance mode with a custom maintenance motd and icon.
-softdepend: [ProtocolLib, ServerListPlus]
+softdepend: [ProtocolLib, ServerListPlus, ProtocolSupport]
 website: https://www.spigotmc.org/resources/maintenance.40699/
 api-version: 1.13
 

maintenance-sponge/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.kennytv.maintenance</groupId>
         <artifactId>maintenance-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.0.4</version>
     </parent>
 
     <artifactId>maintenance-sponge</artifactId>

maintenance-sponge/src/main/java/eu/kennytv/maintenance/sponge/MaintenanceSpongePlugin.java

@@ -41,6 +41,7 @@ import org.spongepowered.api.Platform;
 import org.spongepowered.api.Server;
 import org.spongepowered.api.command.CommandSource;
 import org.spongepowered.api.config.ConfigDir;
+import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.event.EventManager;
 import org.spongepowered.api.event.Listener;
 import org.spongepowered.api.event.game.GameReloadEvent;
@@ -93,7 +94,7 @@ public final class MaintenanceSpongePlugin extends MaintenancePlugin {
     public void onEnable(final GameInitializationEvent event) {
         logger = new LoggerWrapper(container.getLogger());
 
-        settings = new Settings(this, "mysql", "proxied-maintenance-servers", "fallback",
+        settings = new Settings(this, "mysql", "proxied-maintenance-servers", "fallback", "waiting-server",
                 "playercountmessage", "enable-playercountmessage");
 
         sendEnableMessage();
@@ -176,9 +177,11 @@ public final class MaintenanceSpongePlugin extends MaintenancePlugin {
 
     @Override
     protected void kickPlayers() {
-        getServer().getOnlinePlayers().stream()
-                .filter(p -> !hasPermission(p, "bypass") && !settings.getWhitelistedPlayers().containsKey(p.getUniqueId()))
-                .forEach(p -> p.kick(Text.of(settings.getKickMessage())));
+        for (final Player p : getServer().getOnlinePlayers()) {
+            if (!hasPermission(p, "bypass") && !settings.isWhitelisted(p.getUniqueId())) {
+                p.kick(Text.of(settings.getKickMessage()));
+            }
+        }
     }
 
     @Override

maintenance-sponge/src/main/java/eu/kennytv/maintenance/sponge/command/MaintenanceSpongeCommand.java

@@ -36,9 +36,9 @@ import org.spongepowered.api.world.Location;
 import org.spongepowered.api.world.World;
 
 import javax.annotation.Nullable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 @NonnullByDefault
 public final class MaintenanceSpongeCommand extends MaintenanceCommand implements CommandCallable {
@@ -91,7 +91,11 @@ public final class MaintenanceSpongeCommand extends MaintenanceCommand implement
 
     @Override
     public List<String> getPlayersCompletion() {
-        return Sponge.getServer().getOnlinePlayers().stream().map(Player::getName).collect(Collectors.toList());
+        final List<String> list = new ArrayList<>();
+        for (final Player player : Sponge.getServer().getOnlinePlayers()) {
+            list.add(player.getName());
+        }
+        return list;
     }
 
     private String[] getArgs(final String arguments, final int limit) {

maintenance-sponge/src/main/java/eu/kennytv/maintenance/sponge/listener/ClientConnectionListener.java

@@ -23,6 +23,7 @@ import eu.kennytv.maintenance.core.listener.JoinListenerBase;
 import eu.kennytv.maintenance.sponge.MaintenanceSpongePlugin;
 import eu.kennytv.maintenance.sponge.util.SpongeSenderInfo;
 import org.spongepowered.api.Sponge;
+import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.event.Listener;
 import org.spongepowered.api.event.network.ClientConnectionEvent;
 import org.spongepowered.api.text.Text;
@@ -37,9 +38,13 @@ public final class ClientConnectionListener extends JoinListenerBase {
 
     @Listener
     public void login(final ClientConnectionEvent.Login event) {
-        if (kickPlayer(new SpongeSenderInfo(event.getTargetUser().getPlayer().get()), false)) {
+        final Player player = event.getTargetUser().getPlayer().get();
+        if (shouldKick(new SpongeSenderInfo(player), false)) {
             event.setCancelled(true);
             event.setMessage(Text.of(settings.getKickMessage()));
+            if (settings.isJoinNotifications()) {
+                broadcastJoinNotification(player.getName());
+            }
         }
     }
 
@@ -50,8 +55,11 @@ public final class ClientConnectionListener extends JoinListenerBase {
 
     @Override
     protected void broadcastJoinNotification(final String name) {
-
         final Text text = plugin.translate(settings.getMessage("joinNotification").replace("%PLAYER%", name));
-        Sponge.getServer().getOnlinePlayers().stream().filter(p -> plugin.hasPermission(p, "joinnotification")).forEach(p -> p.sendMessage(text));
+        for (final Player p : Sponge.getServer().getOnlinePlayers()) {
+            if (plugin.hasPermission(p, "joinnotification")) {
+                p.sendMessage(text);
+            }
+        }
     }
 }

maintenance-velocity/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.kennytv.maintenance</groupId>
         <artifactId>maintenance-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.0.4</version>
     </parent>
 
     <artifactId>maintenance-velocity</artifactId>
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.velocitypowered</groupId>
             <artifactId>velocity-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.4-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -40,7 +40,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.2.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

maintenance-velocity/src/main/java/eu/kennytv/maintenance/velocity/MaintenanceVelocityPlugin.java

@@ -23,7 +23,6 @@ import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.event.EventManager;
 import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.Subscribe;
-import com.velocitypowered.api.event.player.ServerPreConnectEvent;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.event.proxy.ProxyPingEvent;
 import com.velocitypowered.api.event.proxy.ProxyReloadEvent;
@@ -45,7 +44,6 @@ import eu.kennytv.maintenance.core.util.SenderInfo;
 import eu.kennytv.maintenance.core.util.ServerType;
 import eu.kennytv.maintenance.core.util.Task;
 import eu.kennytv.maintenance.velocity.command.MaintenanceVelocityCommand;
-import eu.kennytv.maintenance.velocity.listener.LoginListener;
 import eu.kennytv.maintenance.velocity.listener.ProxyPingListener;
 import eu.kennytv.maintenance.velocity.listener.ServerConnectListener;
 import eu.kennytv.maintenance.velocity.util.LoggerWrapper;
@@ -74,7 +72,7 @@ import java.util.stream.Collectors;
  * @since 3.0
  */
 @Plugin(id = "maintenancevelocity", name = "MaintenanceVelocity", version = MaintenanceVersion.VERSION, authors = "KennyTV",
-        description = "Enable maintenance mode with a custom maintenance motd and icon.", url = "https://www.spigotmc.org/resources/maintenance.40699/",
+        description = "Enable maintenance mode with a custom maintenance motd and icon.", url = "https://forums.velocitypowered.com/t/maintenance/129",
         dependencies = @Dependency(id = "serverlistplus", optional = true))
 public final class MaintenanceVelocityPlugin extends MaintenanceProxyPlugin {
     private final ProxyServer server;
@@ -102,8 +100,7 @@ public final class MaintenanceVelocityPlugin extends MaintenanceProxyPlugin {
         server.getCommandManager().register(command, "maintenance", "maintenancevelocity");
         final EventManager em = server.getEventManager();
         em.register(this, ProxyPingEvent.class, PostOrder.LAST, new ProxyPingListener(this, settingsProxy));
-        em.register(this, ServerPreConnectEvent.class, PostOrder.LAST, new ServerConnectListener(this, settingsProxy));
-        em.register(this, new LoginListener(this, settingsProxy));
+        em.register(this, new ServerConnectListener(this, settingsProxy));
 
         continueLastEndtimer();
 
@@ -139,34 +136,60 @@ public final class MaintenanceVelocityPlugin extends MaintenanceProxyPlugin {
     }
 
     public boolean isMaintenance(final RegisteredServer serverInfo) {
-        return settingsProxy.isMaintenance(new VelocityServer(serverInfo));
+        return settingsProxy.isMaintenance(serverInfo.getServerInfo().getName());
     }
 
     @Override
-    protected void kickPlayers() {
-        server.getAllPlayers().stream()
-                .filter(p -> !hasPermission(p, "bypass") && !settingsProxy.getWhitelistedPlayers().containsKey(p.getUniqueId()))
-                .forEach(p -> p.disconnect(TextComponent.of(settingsProxy.getKickMessage())));
+    protected void kickPlayersFromProxy() {
+        for (final Player p : server.getAllPlayers()) {
+            if (!hasPermission(p, "bypass") && !settingsProxy.isWhitelisted(p.getUniqueId())) {
+                p.disconnect(TextComponent.of(settingsProxy.getKickMessage()));
+            }
+        }
     }
 
     @Override
     protected void kickPlayers(final Server server, final Server fallback) {
         final RegisteredServer fallbackServer = fallback != null ? ((VelocityServer) fallback).getServer() : null;
-        ((VelocityServer) server).getServer().getPlayersConnected().forEach(p -> {
-            if (!hasPermission(p, "bypass") && !settingsProxy.getWhitelistedPlayers().containsKey(p.getUniqueId())) {
-                if (fallbackServer != null && !isMaintenance(fallback)) {
-                    p.sendMessage(translate(settingsProxy.getMessage("singleMaintenanceActivated").replace("%SERVER%", server.getName())));
+        final boolean checkForFallback = fallbackServer != null && !isMaintenance(fallback);
+        for (final Player player : ((VelocityServer) server).getServer().getPlayersConnected()) {
+            if (!hasPermission(player, "bypass") && !settingsProxy.isWhitelisted(player.getUniqueId())) {
+                if (checkForFallback) {
+                    player.sendMessage(translate(settingsProxy.getMessage("singleMaintenanceActivated").replace("%SERVER%", server.getName())));
                     // Kick the player if fallback server is not reachable
-                    p.createConnectionRequest(fallbackServer).connect().whenComplete((result, e) -> {
-                        if (!result.isSuccessful())
-                            p.disconnect(TextComponent.of(settingsProxy.getMessage("singleMaintenanceKickComplete").replace("%NEWLINE%", "\n").replace("%SERVER%", server.getName())));
+                    player.createConnectionRequest(fallbackServer).connect().whenComplete((result, e) -> {
+                        if (!result.isSuccessful()) {
+                            player.disconnect(TextComponent.of(settingsProxy.getMessage("singleMaintenanceKickComplete").replace("%NEWLINE%", "\n").replace("%SERVER%", server.getName())));
+                        }
                     });
                 } else
-                    p.disconnect(TextComponent.of(settingsProxy.getMessage("singleMaintenanceKickComplete").replace("%NEWLINE%", "\n").replace("%SERVER%", server.getName())));
+                    player.disconnect(TextComponent.of(settingsProxy.getMessage("singleMaintenanceKickComplete").replace("%NEWLINE%", "\n").replace("%SERVER%", server.getName())));
             } else {
-                p.sendMessage(translate(settingsProxy.getMessage("singleMaintenanceActivated").replace("%SERVER%", server.getName())));
+                player.sendMessage(translate(settingsProxy.getMessage("singleMaintenanceActivated").replace("%SERVER%", server.getName())));
             }
-        });
+        }
+    }
+
+    @Override
+    protected void kickPlayersTo(final Server server) {
+        final RegisteredServer waitingServer = ((VelocityServer) server).getServer();
+        // Notifications done in global method
+        for (final Player player : this.server.getAllPlayers()) {
+            if (hasPermission(player, "bypass") || settingsProxy.isWhitelisted(player.getUniqueId())) continue;
+            if (player.getCurrentServer().isPresent() && player.getCurrentServer().get().getServerInfo().getName().equals(waitingServer.getServerInfo().getName()))
+                continue;
+            if (!isMaintenance(waitingServer)) {
+                player.createConnectionRequest(waitingServer).connect().whenComplete((result, e) -> {
+                    if (result.isSuccessful()) {
+                        player.sendMessage(translate(settingsProxy.getMessage("sentToWaitingServer").replace("%SERVER%", server.getName())));
+                    } else {
+                        player.disconnect(TextComponent.of(settingsProxy.getKickMessage()));
+                    }
+                });
+            } else {
+                player.disconnect(TextComponent.of(settingsProxy.getKickMessage()));
+            }
+        }
     }
 
     @Override
@@ -195,7 +218,7 @@ public final class MaintenanceVelocityPlugin extends MaintenanceProxyPlugin {
     @Override
     public String getServer(final SenderInfo sender) {
         final Optional<Player> player = server.getPlayer(sender.getUuid());
-        if (!player.isPresent() || player.get().getCurrentServer().isPresent()) return "";
+        if (!player.isPresent() || !player.get().getCurrentServer().isPresent()) return null;
         return player.get().getCurrentServer().get().getServerInfo().getName();
     }
 

maintenance-velocity/src/main/java/eu/kennytv/maintenance/velocity/command/MaintenanceVelocityCommand.java

@@ -21,6 +21,7 @@ package eu.kennytv.maintenance.velocity.command;
 import com.velocitypowered.api.command.Command;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.server.RegisteredServer;
 import eu.kennytv.maintenance.core.proxy.SettingsProxy;
 import eu.kennytv.maintenance.core.proxy.command.MaintenanceProxyCommand;
 import eu.kennytv.maintenance.core.util.SenderInfo;
@@ -31,8 +32,8 @@ import net.kyori.text.event.ClickEvent;
 import net.kyori.text.event.HoverEvent;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public final class MaintenanceVelocityCommand extends MaintenanceProxyCommand implements Command {
     private final MaintenanceVelocityPlugin plugin;
@@ -77,13 +78,22 @@ public final class MaintenanceVelocityCommand extends MaintenanceProxyCommand im
 
     @Override
     public List<String> getServersCompletion(final String s) {
-        return plugin.getServer().getAllServers().stream().filter(server -> server.getServerInfo().getName().toLowerCase().startsWith(s))
-                .filter(server -> !plugin.getSettingsProxy().getFallbackServer().contains(server.getServerInfo().getName()))
-                .map(server -> server.getServerInfo().getName()).collect(Collectors.toList());
+        final List<String> list = new ArrayList<>();
+        for (final RegisteredServer server : plugin.getServer().getAllServers()) {
+            final String name = server.getServerInfo().getName();
+            if (name.toLowerCase().startsWith(s) && !plugin.getSettingsProxy().getMaintenanceServers().contains(name)) {
+                list.add(name);
+            }
+        }
+        return list;
     }
 
     @Override
     public List<String> getPlayersCompletion() {
-        return plugin.getServer().getAllPlayers().stream().map(Player::getUsername).collect(Collectors.toList());
+        final List<String> list = new ArrayList<>();
+        for (final Player player : plugin.getServer().getAllPlayers()) {
+            list.add(player.getUsername());
+        }
+        return list;
     }
 }

maintenance-velocity/src/main/java/eu/kennytv/maintenance/velocity/listener/LoginListener.java

@@ -1,56 +0,0 @@
-/*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package eu.kennytv.maintenance.velocity.listener;
-
-import com.velocitypowered.api.event.ResultedEvent;
-import com.velocitypowered.api.event.Subscribe;
-import com.velocitypowered.api.event.connection.LoginEvent;
-import com.velocitypowered.api.event.connection.PostLoginEvent;
-import eu.kennytv.maintenance.core.Settings;
-import eu.kennytv.maintenance.core.listener.JoinListenerBase;
-import eu.kennytv.maintenance.velocity.MaintenanceVelocityPlugin;
-import eu.kennytv.maintenance.velocity.util.VelocitySenderInfo;
-import net.kyori.text.TextComponent;
-
-public final class LoginListener extends JoinListenerBase {
-    private final MaintenanceVelocityPlugin plugin;
-
-    public LoginListener(final MaintenanceVelocityPlugin plugin, final Settings settings) {
-        super(plugin, settings);
-        this.plugin = plugin;
-    }
-
-    @Subscribe
-    public void login(final LoginEvent event) {
-        if (!event.getResult().isAllowed()) return;
-        if (kickPlayer(new VelocitySenderInfo(event.getPlayer()), false))
-            event.setResult(ResultedEvent.ComponentResult.denied(plugin.translate(settings.getKickMessage())));
-    }
-
-    @Subscribe
-    public void postLogin(final PostLoginEvent event) {
-        updateCheck(new VelocitySenderInfo(event.getPlayer()));
-    }
-
-    @Override
-    protected void broadcastJoinNotification(final String name) {
-        final TextComponent s = plugin.translate(settings.getMessage("joinNotification").replace("%PLAYER%", name));
-        plugin.getServer().getAllPlayers().stream().filter(p -> plugin.hasPermission(p, "joinnotification")).forEach(p -> p.sendMessage(s));
-    }
-}

maintenance-velocity/src/main/java/eu/kennytv/maintenance/velocity/listener/ServerConnectListener.java

@@ -18,66 +18,94 @@
 
 package eu.kennytv.maintenance.velocity.listener;
 
-import com.velocitypowered.api.event.EventHandler;
+import com.velocitypowered.api.event.PostOrder;
+import com.velocitypowered.api.event.ResultedEvent;
+import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.connection.LoginEvent;
+import com.velocitypowered.api.event.connection.PostLoginEvent;
 import com.velocitypowered.api.event.player.ServerPreConnectEvent;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
+import eu.kennytv.maintenance.api.proxy.Server;
 import eu.kennytv.maintenance.core.proxy.SettingsProxy;
+import eu.kennytv.maintenance.core.proxy.listener.ProxyJoinListenerBase;
+import eu.kennytv.maintenance.core.proxy.util.ServerConnectResult;
 import eu.kennytv.maintenance.velocity.MaintenanceVelocityPlugin;
+import eu.kennytv.maintenance.velocity.util.VelocitySenderInfo;
+import eu.kennytv.maintenance.velocity.util.VelocityServer;
 import net.kyori.text.TextComponent;
 
 import java.util.Optional;
 
-public final class ServerConnectListener implements EventHandler<ServerPreConnectEvent> {
+public final class ServerConnectListener extends ProxyJoinListenerBase {
     private final MaintenanceVelocityPlugin plugin;
-    private final SettingsProxy settings;
-    private boolean warned;
 
     public ServerConnectListener(final MaintenanceVelocityPlugin plugin, final SettingsProxy settings) {
+        super(plugin, settings);
         this.plugin = plugin;
-        this.settings = settings;
+    }
+
+    @Subscribe
+    public void login(final LoginEvent event) {
+        if (!event.getResult().isAllowed()) return;
+
+        final VelocitySenderInfo sender = new VelocitySenderInfo(event.getPlayer());
+        if (shouldKick(sender, false)) {
+            final Server waitingServer = shouldConnectToWaitingServer(sender);
+            // Do the actual connecting in the ServerPreConnectEvent handler if a waiting server exists
+            if (waitingServer != null) return;
+
+            event.setResult(ResultedEvent.ComponentResult.denied(plugin.translate(settings.getKickMessage())));
+            if (settings.isJoinNotifications()) {
+                broadcastJoinNotification(event.getPlayer().getUsername());
+            }
+        }
+    }
+
+    @Subscribe
+    public void postLogin(final PostLoginEvent event) {
+        updateCheck(new VelocitySenderInfo(event.getPlayer()));
+    }
+
+    @Subscribe(order = PostOrder.LAST)
+    public void preConnect(final ServerPreConnectEvent event) {
+        if (!event.getResult().isAllowed()) return;
+
+        final Optional<RegisteredServer> optionalTarget = event.getResult().getServer();
+        if (!optionalTarget.isPresent()) return;
+
+        final Player player = event.getPlayer();
+        final boolean hasCurrentServer = player.getCurrentServer().isPresent();
+        final ServerConnectResult connectResult = serverConnect(new VelocitySenderInfo(player), new VelocityServer(optionalTarget.get()), hasCurrentServer);
+        if (connectResult.isCancelled()) {
+            event.setResult(ServerPreConnectEvent.ServerResult.denied());
+
+            // Player has no server to connect to
+            if (!hasCurrentServer) {
+                player.disconnect(TextComponent.of(settings.getKickMessage()));
+            }
+        } else if (connectResult.getTarget() != null) {
+            final RegisteredServer newTarget = ((VelocityServer) connectResult.getTarget()).getServer();
+            event.setResult(ServerPreConnectEvent.ServerResult.allowed(newTarget));
+        }
     }
 
     @Override
-    public void execute(final ServerPreConnectEvent event) {
-        if (!event.getResult().isAllowed()) return;
-
-        final Player player = event.getPlayer();
-        if (!event.getResult().getServer().isPresent()) return;
-
-        final RegisteredServer target = event.getResult().getServer().get();
-        if (!plugin.isMaintenance(target)) return;
-        if (plugin.hasPermission(player, "bypass") || settings.getWhitelistedPlayers().containsKey(player.getUniqueId())) return;
-
-        event.setResult(ServerPreConnectEvent.ServerResult.denied());
-        if (settings.isJoinNotifications()) {
-            final TextComponent s = plugin.translate(settings.getMessage("joinNotification").replace("%PLAYER%", player.getUsername()));
-            target.getPlayersConnected().stream().filter(p -> plugin.hasPermission(p, "joinnotification")).forEach(p -> p.sendMessage(s));
-        }
-
-        // Normal serverconnect
-        if (player.getCurrentServer().isPresent()) {
-            player.sendMessage(plugin.translate(settings.getMessage("singleMaintenanceKick").replace("%SERVER%", target.getServerInfo().getName())));
-            return;
-        }
-
-        // If it's the initial proxy join or a kick from another server, go back to fallback server
-        final Optional<RegisteredServer> fallback = plugin.getServer().getServer(settings.getFallbackServer());
-        if (!fallback.isPresent() || plugin.isMaintenance(fallback.get())) {
-            disconnect(player, target);
-            if (!warned) {
-                plugin.getLogger().warning("Could not send player to the set fallback server! Instead kicking player off the network!");
-                warned = true;
-            }
-        } else {
-            player.createConnectionRequest(fallback.get()).connect().whenComplete((result, throwable) -> {
-                if (!result.isSuccessful()) disconnect(player, target);
-            });
-        }
+    protected void broadcastJoinNotification(final String name) {
+        sendJoinMessage(plugin.getServer().getAllPlayers(), name);
     }
 
-    private void disconnect(final Player player, final RegisteredServer target) {
-        player.disconnect(TextComponent.of(settings.getMessage("singleMaintenanceKickComplete").replace("%NEWLINE%", "\n")
-                .replace("%SERVER%", target.getServerInfo().getName())));
+    @Override
+    protected void broadcastJoinNotification(final String name, final Server server) {
+        sendJoinMessage(((VelocityServer) server).getServer().getPlayersConnected(), name);
+    }
+
+    private void sendJoinMessage(final Iterable<Player> players, final String name) {
+        final TextComponent message = plugin.translate(settings.getMessage("joinNotification").replace("%PLAYER%", name));
+        for (final Player player : players) {
+            if (plugin.hasPermission(player, "joinnotification")) {
+                player.sendMessage(message);
+            }
+        }
     }
 }

maintenance-velocity/src/main/java/eu/kennytv/maintenance/velocity/util/VelocitySenderInfo.java

@@ -20,13 +20,14 @@ package eu.kennytv.maintenance.velocity.util;
 
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
-import eu.kennytv.maintenance.core.util.SenderInfo;
+import eu.kennytv.maintenance.api.proxy.Server;
+import eu.kennytv.maintenance.core.proxy.util.ProxySenderInfo;
 import net.kyori.text.TextComponent;
 import net.kyori.text.serializer.legacy.LegacyComponentSerializer;
 
 import java.util.UUID;
 
-public final class VelocitySenderInfo implements SenderInfo {
+public final class VelocitySenderInfo implements ProxySenderInfo {
     private final CommandSource sender;
 
     public VelocitySenderInfo(final CommandSource sender) {
@@ -61,4 +62,14 @@ public final class VelocitySenderInfo implements SenderInfo {
     public void sendMessage(final TextComponent textComponent) {
         sender.sendMessage(textComponent);
     }
+
+    @Override
+    public boolean canAccess(final Server server) {
+        return true;
+    }
+
+    @Override
+    public void disconnect(final String message) {
+        ((Player) sender).disconnect(TextComponent.of(message));
+    }
 }

maintenance-velocity/src/main/java/eu/kennytv/maintenance/velocity/util/VelocityServer.java

@@ -18,6 +18,7 @@
 
 package eu.kennytv.maintenance.velocity.util;
 
+import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import eu.kennytv.maintenance.api.proxy.Server;
 import net.kyori.text.TextComponent;
@@ -43,7 +44,9 @@ public final class VelocityServer implements Server {
     @Override
     public void broadcast(final String message) {
         final TextComponent s = LegacyComponentSerializer.INSTANCE.deserialize(message);
-        server.getPlayersConnected().forEach(p -> p.sendMessage(s));
+        for (final Player p : server.getPlayersConnected()) {
+            p.sendMessage(s);
+        }
     }
 
     public RegisteredServer getServer() {

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>eu.kennytv.maintenance</groupId>
     <artifactId>maintenance-parent</artifactId>
-    <version>3.0.2</version>
+    <version>3.0.4</version>
     <packaging>pom</packaging>
 
     <name>Maintenance</name>
@@ -40,17 +40,13 @@
 
     <repositories>
         <repository>
-            <id>bungeecord-repo</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <id>spigotmc</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
         </repository>
         <repository>
             <id>papermc</id>
             <url>https://papermc.io/repo/repository/maven-public/</url>
         </repository>
-        <repository>
-            <id>spigotmc-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-        </repository>
         <repository>
             <id>sponge</id>
             <url>http://repo.spongepowered.org/maven</url>
@@ -60,7 +56,7 @@
             <url>https://repo.velocitypowered.com/snapshots</url>
         </repository>
         <repository>
-            <id>dmulloy2-repo</id>
+            <id>dmulloy2</id>
             <url>http://repo.dmulloy2.net/nexus/repository/public/</url>
         </repository>
         <repository>
@@ -75,7 +71,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.2.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>