3.0.5 Release

Prepare for 3.0.5 release
Config test additions
2020-06-17 10:48:13 +02:00 · 2020-06-17 10:47:20 +02:00 · 2020-06-17 09:31:49 +02:00 · 2020-06-16 17:49:45 +02:00 · 2020-06-16 16:39:23 +02:00 · 2020-06-16 16:20:18 +02:00
124 changed files with 1718 additions and 725 deletions
@@ -1,7 +1,40 @@
 # 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.

-## Unreleased
+## 3.0.5 - June 17th 2020
+### Changed
+* The plugin identifiers are now `Maintenance` instead of the previous `MaintenanceSpigot` and `MaintenanceBungee`,
+ and `maintenance` instead of `maintenancesponge` and `maintenancevelocity`
+  * The plugin directory will automatically be renamed accordingly when starting the server
+  * If you are using the MaintenancePlaceholderAddon, you need to [update it to 1.0.3](https://github.com/KennyTV/MaintenanceAddon/releases)
+* Bungee/Velocity: The `fallback` field can now also be set as a list to define multiple fallback servers
+* Bungee/Velocity: Added language fields to choose custom kickmessages for individual proxied servers
+  * See [**HERE**](https://github.com/KennyTV/Maintenance/wiki/Configuration#language-file) for an example setting
+* Added Chinese language file (thanks to Spigot user yeban)
+* Added Italian language file (thanks to @TheViperShow)
+* Updated Russian language file (thanks to Spigot user En_0t_S)
+* Removed automated config migration from 2.x->3.0
+  * See [**HERE**](https://github.com/KennyTV/Maintenance/wiki/Updates#updating-from-2x) on how to do that manually - virtually noone should be using such old versions anymore
+### Fixed
+* Fixed the `use-ssl` option being inverted
+* Fixed disabling the playercount-message still hiding online/max players
+* Fixed config parsing with multi line strings
+* Bungee: Fixed compatibility with other motd changing plugins using the 'HIGHEST' ping listener priority
+
+## 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 singleserver timers broadcasting globally
+* 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
@@ -15,7 +48,7 @@ This file contains update logs for this project. The top may contain a `Unreleas
 * 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.
+* Fixed the config autoupdater when the config contained strings broken over multiple lines
 ---
 ## 3.0.2 - May 17th 2019
 ### Changed
@@ -1,5 +1,4 @@
 .metadata
-dependencies/
 bin/
 tmp/
 *.tmp
@@ -92,4 +91,5 @@ $RECYCLE.BIN/
 *.msm
 *.msp
 *.lnk
-!MaintenanceAPI.jar
+!MaintenanceAPI.jar
+**/src/test/resources/
@@ -1,10 +1,11 @@
 # Maintenance
 [![Version](https://img.shields.io/github/release/KennyTV/Maintenance.svg)](https://github.com/KennyTV/Maintenance/releases)
 [![Build Status](https://travis-ci.org/KennyTV/Maintenance.svg?branch=master)](https://travis-ci.org/KennyTV/Maintenance)
+[![GH Downloads](https://img.shields.io/github/downloads/KennyTV/Maintenance/total)](https://github.com/KennyTV/Maintenance/releases)
 [![Discord](https://img.shields.io/discord/489135856284729384.svg?label=Discord&logo=discord&logoColor=fff)](https://discord.gg/vGCUzHq)
 [![Twitter](https://img.shields.io/twitter/follow/KennyTVN.svg?label=Twitter)](https://twitter.com/KennyTVN)

-Maintenance is probably the most customizable free maintenance plugin for your Minecraft server you can find. It runs on Bukkit/Spigot, BungeeCord, Sponge as well as Velocity.
+Maintenance is probably the most customizable free maintenance plugin for your Minecraft server you can find. It runs on Spigot, BungeeCord, Sponge, as well as Velocity.

 Its features include:
 * A custom motd as well as server icon, that will be shown during maintenance
@@ -18,12 +19,12 @@ Its features include:
  * Use PlaceholderAPI placeholders with the [**MaintenanceAddon**](https://github.com/KennyTV/Maintenance/wiki/MaintenanceAddon) (only for Bungee)

 A full list of commands, permissions and configuration options can be found in the wiki listed below.
-* [Wiki](https://github.com/KennyTV/Maintenance/wiki)
+* [Wiki](https://github.com/KennyTV/Maintenance/wiki) (configuration, permissions, API usage)
 * [Downloads](https://github.com/KennyTV/Maintenance/releases) (GitHub)
-* [Development builds](https://kennytv.eu/maintenance/snapshot/) (might be unstable)
 * [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)
+* [PlaceholderAPI addon](https://github.com/KennyTV/Maintenance/wiki/MaintenanceAddon)

 Other forum threads
 * [Spigot forums](https://www.spigotmc.org/resources/maintenance.40699/)
@@ -6,7 +6,7 @@
    <parent>
        <groupId>eu.kennytv.maintenance</groupId>
        <artifactId>maintenance-parent</artifactId>
-        <version>3.0.3</version>
+        <version>3.0.5</version>
    </parent>

    <artifactId>maintenance-api</artifactId>
@@ -16,13 +16,13 @@
        <dependency>
            <groupId>net.md-5</groupId>
            <artifactId>bungeecord-api</artifactId>
-            <version>1.14-SNAPSHOT</version>
+            <version>1.15-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
-            <groupId>com.destroystokyo.paper</groupId>
-            <artifactId>paper-api</artifactId>
-            <version>1.14.4-R0.1-SNAPSHOT</version>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.15.2-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -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.
     *
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -18,6 +18,7 @@

 package eu.kennytv.maintenance.api.bungee;

+import com.google.common.base.Preconditions;
 import eu.kennytv.maintenance.api.IMaintenanceBase;
 import eu.kennytv.maintenance.api.proxy.IMaintenanceProxy;
 import net.md_5.bungee.api.ProxyServer;
@@ -41,9 +42,8 @@ public final class MaintenanceBungeeAPI {
     * @throws IllegalArgumentException if using a custom (or broken?) version of the plugin, that can't be identified
     */
    public static IMaintenanceProxy getAPI() {
-        final Plugin maintenance = ProxyServer.getInstance().getPluginManager().getPlugin("MaintenanceBungee");
-        if (maintenance == null)
-            throw new IllegalArgumentException("Could not get instance of MaintenanceBungee! Broken/custom build of the plugin?");
+        final Plugin maintenance = ProxyServer.getInstance().getPluginManager().getPlugin("Maintenance");
+        Preconditions.checkNotNull(maintenance, "Could not get instance of Maintenance! Broken/custom build of the plugin?");
        return (IMaintenanceProxy) ((IMaintenanceBase) maintenance).getApi();
    }
 }
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -19,6 +19,7 @@
 package eu.kennytv.maintenance.api.proxy;

 import eu.kennytv.maintenance.api.IMaintenance;
+import org.jetbrains.annotations.Nullable;

 import java.util.Set;

@@ -60,6 +61,7 @@ public interface IMaintenanceProxy extends IMaintenance {
     * @param server name of the proxied server
     * @return wrapped server object if present, else null
     */
+    @Nullable
    Server getServer(String server);

    /**
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -18,6 +18,7 @@

 package eu.kennytv.maintenance.api.spigot;

+import com.google.common.base.Preconditions;
 import eu.kennytv.maintenance.api.IMaintenance;
 import eu.kennytv.maintenance.api.IMaintenanceBase;
 import org.bukkit.Bukkit;
@@ -41,9 +42,8 @@ public final class MaintenanceSpigotAPI {
     * @throws IllegalArgumentException if using a custom (or broken?) version of the plugin, that can't be identified
     */
    public static IMaintenance getAPI() {
-        final Plugin maintenance = Bukkit.getPluginManager().getPlugin("MaintenanceSpigot");
-        if (maintenance == null)
-            throw new IllegalArgumentException("Could not get instance of MaintenanceSpigot! Broken/custom build of the plugin?");
+        final Plugin maintenance = Bukkit.getPluginManager().getPlugin("Maintenance");
+        Preconditions.checkNotNull(maintenance, "Could not get instance of Maintenance! Broken/custom build of the plugin?");
        return ((IMaintenanceBase) maintenance).getApi();
    }
 }
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -18,6 +18,7 @@

 package eu.kennytv.maintenance.api.sponge;

+import com.google.common.base.Preconditions;
 import eu.kennytv.maintenance.api.IMaintenance;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.plugin.PluginContainer;
@@ -42,9 +43,9 @@ public final class MaintenanceSpongeAPI {
     * @throws IllegalArgumentException if using a custom (or broken?) version of the plugin, that can't be identified
     */
    public static IMaintenance getAPI() {
-        final Optional<PluginContainer> container = Sponge.getPluginManager().getPlugin("maintenancesponge");
-        if (!container.isPresent() || !container.get().getInstance().isPresent())
-            throw new IllegalArgumentException("Could not get instance of MaintenanceSponge! Broken/custom build of the plugin?");
+        final Optional<PluginContainer> container = Sponge.getPluginManager().getPlugin("maintenance");
+        Preconditions.checkArgument(container.isPresent() && container.get().getInstance().isPresent(),
+                "Could not get instance of Maintenance! Broken/custom build of the plugin?");
        return (IMaintenance) container.get().getInstance().get();
    }
 }
@@ -6,7 +6,7 @@
    <parent>
        <groupId>eu.kennytv.maintenance</groupId>
        <artifactId>maintenance-parent</artifactId>
-        <version>3.0.3</version>
+        <version>3.0.5</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>
@@ -6,7 +6,7 @@
    <parent>
        <groupId>eu.kennytv.maintenance</groupId>
        <artifactId>maintenance-parent</artifactId>
-        <version>3.0.3</version>
+        <version>3.0.5</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>
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -47,6 +47,7 @@ import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.PluginManager;
+import org.jetbrains.annotations.Nullable;

 import javax.imageio.ImageIO;
 import java.io.File;
@@ -116,9 +117,9 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
    }

    @Override
-    protected void kickPlayers() {
+    protected void kickPlayersFromProxy() {
        for (final ProxiedPlayer p : getProxy().getPlayers()) {
-            if (!hasPermission(p, "bypass") && !settingsProxy.getWhitelistedPlayers().containsKey(p.getUniqueId())) {
+            if (!hasPermission(p, "bypass") && !settingsProxy.isWhitelisted(p.getUniqueId())) {
                p.disconnect(settingsProxy.getKickMessage());
            }
        }
@@ -126,16 +127,35 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {

    @Override
    protected void kickPlayers(final Server server, final Server fallback) {
+        // Kick players from a proxied server
        final ServerInfo fallbackServer = fallback != null ? ((BungeeServer) fallback).getServer() : null;
-        for (final ProxiedPlayer p : ((BungeeServer) server).getServer().getPlayers()) {
-            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.getFullServerKickMessage(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) {
+        // Kick all players to a single waiting 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());
            }
        }
    }
@@ -146,27 +166,32 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
    }

    @Override
+    @Nullable
    public Server getServer(final String server) {
        final ServerInfo serverInfo = getProxy().getServerInfo(server);
        return serverInfo != null ? new BungeeServer(serverInfo) : null;
    }

    @Override
+    @Nullable
    public SenderInfo getOfflinePlayer(final String name) {
        final ProxiedPlayer player = getProxy().getPlayer(name);
        return player != null ? new BungeeSenderInfo(player) : null;
    }

    @Override
+    @Nullable
    public SenderInfo getOfflinePlayer(final UUID uuid) {
        final ProxiedPlayer player = getProxy().getPlayer(uuid);
        return player != null ? new BungeeSenderInfo(player) : null;
    }

    @Override
+    @Nullable
    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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -35,7 +35,7 @@ public final class ProxyPingListener implements Listener {
        this.settings = settings;
    }

-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = 80)
    public void proxyPing(final ProxyPingEvent event) {
        if (!settings.isMaintenance()) return;

@@ -48,13 +48,12 @@ public final class ProxyPingListener implements Listener {
        }

        ping.setDescription(settings.getRandomPingMessage());
-        ping.getPlayers().setOnline(0);
-        ping.getPlayers().setMax(0);
        ping.getPlayers().setSample(new ServerPing.PlayerInfo[]{
-                new ServerPing.PlayerInfo(settings.getPlayerCountHoverMessage().replace("%NEWLINE%", "\n"), "")
+                new ServerPing.PlayerInfo(settings.getPlayerCountHoverMessage(), "")
        });

-        if (settings.hasCustomIcon() && plugin.getFavicon() != null)
+        if (settings.hasCustomIcon() && plugin.getFavicon() != null) {
            ping.setFavicon(plugin.getFavicon());
+        }
    }
 }
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -18,38 +18,49 @@

 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.core.listener.JoinListenerBase;
+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 extends JoinListenerBase 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 initialServerConnect(final ServerConnectEvent event) {
        // Global maintenance check
        if (event.isCancelled() || event.getReason() != ServerConnectEvent.Reason.JOIN_PROXY) return;
-        if (kickPlayer(new BungeeSenderInfo(event.getPlayer()))) {
+
+        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());
+            }
        }
    }

@@ -59,49 +70,36 @@ public final class ServerConnectListener extends JoinListenerBase implements Lis
        if (event.isCancelled()) return;

        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())
-                || plugin.hasPermission(player, "singleserver.bypass." + target.getName().toLowerCase()))
-            return;
-
-        if (settings.isJoinNotifications()) {
-            final BaseComponent[] s = TextComponent.fromLegacyText(settings.getMessage("joinNotification").replace("%PLAYER%", player.getName()));
-            for (final ProxiedPlayer p : target.getPlayers()) {
-                if (plugin.hasPermission(p, "joinnotification")) {
-                    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) {
+        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.sendMessage(settings.getMessage("singleMaintenanceKick").replace("%SERVER%", target.getName()));
-            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)) {
-            event.setCancelled(true);
-            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;
+            // Player has no server to connect to
+            if (player.getServer() == null) {
+                player.disconnect(settings.getKickMessage());
            }
-        } else {
-            event.setTarget(fallback);
+        } else if (connectResult.getTarget() != null) {
+            event.setTarget(((BungeeServer) connectResult.getTarget()).getServer());
        }
    }

    @Override
    protected void broadcastJoinNotification(final String name) {
-        final BaseComponent[] s = TextComponent.fromLegacyText(settings.getMessage("joinNotification").replace("%PLAYER%", name));
-        for (final ProxiedPlayer p : ProxyServer.getInstance().getPlayers()) {
-            if (plugin.hasPermission(p, "joinnotification")) {
-                p.sendMessage(s);
+        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);
            }
        }
    }
@@ -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;
@@ -75,10 +76,12 @@ public final class MetricsLite {
    public JsonObject getPluginData() {
        final JsonObject data = new JsonObject();

-        final String pluginName = plugin.getDescription().getName();
+        //final String pluginName = plugin.getDescription().getName();
+        final String pluginName = "MaintenanceBungee"; // I cut off the suffix, not sure how bStats would like the name change
        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 +95,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 +150,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 +160,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 +202,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 +211,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 +224,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 +240,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 +263,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();
    }

@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -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);
+        }
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,4 +1,4 @@
-name: MaintenanceBungee
+name: Maintenance
 version: ${project.version}
 main: eu.kennytv.maintenance.bungee.MaintenanceBungeeBase
 author: KennyTV
@@ -6,7 +6,7 @@
    <parent>
        <groupId>eu.kennytv.maintenance</groupId>
        <artifactId>maintenance-parent</artifactId>
-        <version>3.0.3</version>
+        <version>3.0.5</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>
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -29,6 +29,7 @@ import eu.kennytv.maintenance.core.runnable.MaintenanceRunnableBase;
 import eu.kennytv.maintenance.core.util.SenderInfo;
 import eu.kennytv.maintenance.core.util.ServerType;
 import eu.kennytv.maintenance.core.util.Task;
+import org.jetbrains.annotations.Nullable;

 import java.util.*;

@@ -47,14 +48,16 @@ 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);
    }

@@ -77,15 +80,16 @@ public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implement
    public void serverActions(final Server server, final boolean maintenance) {
        if (server == null || server instanceof DummyServer) return;
        if (maintenance) {
-            final Server fallback = getServer(settingsProxy.getFallbackServer());
+            final Server fallback = 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()))
-                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,12 +111,13 @@ 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;
    }

    @Override
+    @Nullable
    public List<String> getMaintenanceServersDump() {
        final List<String> list = new ArrayList<>();
        if (isMaintenance()) list.add("global");
@@ -125,11 +130,31 @@ 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;
    }

+    @Nullable
    public abstract String getServer(SenderInfo sender);

    protected abstract void kickPlayers(Server server, Server fallback);
+
+    protected abstract void kickPlayersTo(Server server);
+
+    protected abstract void kickPlayersFromProxy();
 }
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -18,19 +18,24 @@

 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;
+import org.jetbrains.annotations.Nullable;

 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

 public final class SettingsProxy extends Settings {
+    private final MaintenanceProxyPlugin plugin;
    private Set<String> maintenanceServers;
-    private String fallbackServer;
+    private List<String> fallbackServers;
+    private String waitingServer;

    private String mySQLTable;
    private String serverTable;
@@ -44,6 +49,7 @@ public final class SettingsProxy extends Settings {

    public SettingsProxy(final MaintenanceProxyPlugin plugin) {
        super(plugin);
+        this.plugin = plugin;
    }

    private void setupMySQL() throws Exception {
@@ -54,11 +60,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");
@@ -73,7 +81,7 @@ public final class SettingsProxy extends Settings {
    @Override
    protected void loadExtraSettings() {
        // Open database connection if enabled and not already done
-        if (!hasMySQL() && (boolean) config.getDeep("mysql.use-mysql")) {
+        if (!hasMySQL() && config.getBoolean("mysql.use-mysql")) {
            try {
                setupMySQL();
            } catch (final Exception e) {
@@ -83,7 +91,14 @@ public final class SettingsProxy extends Settings {
            }
        }

-        fallbackServer = config.getString("fallback", "lobby");
+        final Object fallback = config.getObject("fallback");
+        fallbackServers = fallback instanceof String ? Collections.singletonList((String) fallback) : config.getStringList("fallback");
+
+        waitingServer = config.getString("waiting-server", "");
+        if (waitingServer.isEmpty() || waitingServer.equalsIgnoreCase("none")) {
+            waitingServer = null;
+        }
+
        if (hasMySQL()) {
            maintenance = loadMaintenance();
            maintenanceServers = loadMaintenanceServersFromSQL();
@@ -116,7 +131,6 @@ public final class SettingsProxy extends Settings {
        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
                for (final String s : databaseValue) {
                    if (!maintenanceServers.contains(s))
@@ -134,6 +148,23 @@ public final class SettingsProxy extends Settings {
        return maintenanceServers.contains(serverName);
    }

+    public String getServerKickMessage(final String server) {
+        String message = getMessage("singleMaintenanceKicks." + server, null);
+        if (message == null) {
+            message = getMessage("singleMaintenanceKick");
+        }
+        return plugin.formatedTimer(message).replace("%SERVER%", server);
+    }
+
+    // Full = being kicked from the proxy, not just a proxied server
+    public String getFullServerKickMessage(final String server) {
+        String message = getMessage("singleMaintenanceKicksComplete." + server, null);
+        if (message == null) {
+            message = getMessage("singleMaintenanceKickComplete");
+        }
+        return plugin.formatedTimer(message).replace("%SERVER%", server);
+    }
+
    public boolean hasMySQL() {
        return mySQL != null;
    }
@@ -211,10 +242,23 @@ public final class SettingsProxy extends Settings {
        return maintenanceServers;
    }

-    public String getFallbackServer() {
-        return fallbackServer;
+    @Nullable
+    public Server getFallbackServer() {
+        for (final String fallbackServer : fallbackServers) {
+            final Server server = plugin.getServer(fallbackServer);
+            if (server != null && !isMaintenance(server.getName())) {
+                return server;
+            }
+        }
+        return null;
    }

+    @Nullable
+    public String getWaitingServer() {
+        return waitingServer;
+    }
+
+    @Nullable
    MySQL getMySQL() {
        return mySQL;
    }
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -67,10 +67,12 @@ 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(getHelpMessage());
    }
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -0,0 +1,122 @@
+/*
+ * Maintenance - https://git.io/maintenancemode
+ * Copyright (C) 2018-2020 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;
+import org.jetbrains.annotations.Nullable;
+
+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 (waitingServer.getName().equals(currentServer)) {
+                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.getServerKickMessage(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 = settings.getFallbackServer();
+        if (fallback == null || !sender.canAccess(fallback)) {
+            // Nothing to redirect to, player has to be kicked from the proxy
+            sender.disconnect(settings.getFullServerKickMessage(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
+     */
+    @Nullable
+    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);
+}
@@ -1,3 +1,21 @@
+/*
+ * Maintenance - https://git.io/maintenancemode
+ * Copyright (C) 2018-2020 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.mysql;

 import com.zaxxer.hikari.HikariConfig;
@@ -8,19 +26,29 @@ 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 +65,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 +84,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();
        }
    }
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -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);
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -38,6 +38,6 @@ public final class DummyServer implements Server {
    }

    @Override
-    public void broadcast(String s) {
+    public void broadcast(final String s) {
    }
 }
@@ -0,0 +1,29 @@
+/*
+ * Maintenance - https://git.io/maintenancemode
+ * Copyright (C) 2018-2020 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);
+}
@@ -0,0 +1,46 @@
+/*
+ * Maintenance - https://git.io/maintenancemode
+ * Copyright (C) 2018-2020 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 org.jetbrains.annotations.Nullable;
+
+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;
+    }
+
+    @Nullable
+    public Server getTarget() {
+        return target;
+    }
+}
@@ -6,7 +6,7 @@
    <parent>
        <groupId>eu.kennytv.maintenance</groupId>
        <artifactId>maintenance-parent</artifactId>
-        <version>3.0.3</version>
+        <version>3.0.5</version>
    </parent>

    <artifactId>maintenance-core</artifactId>
@@ -34,7 +34,7 @@
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
-            <version>21.0</version>
+            <version>29.0-jre</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -36,8 +36,18 @@ 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.core.util.Version;
+import org.jetbrains.annotations.Nullable;

-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
@@ -79,18 +89,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) {
+            broadcast(settings.getMessage("maintenanceActivated"));
            if (settings.isKickOnlinePlayers()) {
                kickPlayers();
            }
-            broadcast(settings.getMessage("maintenanceActivated"));
-        } else
+        } else {
            broadcast(settings.getMessage("maintenanceDeactivated"));
+        }
+
        eventManager.callEvent(new MaintenanceChangedEvent(maintenance));
    }

@@ -122,8 +136,12 @@ public abstract class MaintenancePlugin implements IMaintenance {
    }

    public boolean updateAvailable() {
-        checkNewestVersion();
-        return version.compareTo(newestVersion) == -1;
+        try {
+            checkNewestVersion();
+            return version.compareTo(newestVersion) == -1;
+        } catch (final Exception e) {
+            return false;
+        }
    }

    protected void continueLastEndtimer() {
@@ -150,7 +168,13 @@ public abstract class MaintenancePlugin implements IMaintenance {
        getLogger().info("Plugin by KennyTV");
        if (!settings.hasUpdateChecks()) return;
        async(() -> {
-            checkNewestVersion();
+            try {
+                checkNewestVersion();
+            } catch (final Exception e) {
+                getLogger().warning("An error occured during update checking!");
+                return;
+            }
+
            final int compare = version.compareTo(newestVersion);
            if (compare == -1) {
                getLogger().info("§cNewest version available: §aVersion " + newestVersion + "§c, you're on §a" + version);
@@ -197,16 +221,14 @@ public abstract class MaintenancePlugin implements IMaintenance {
        os.close();
    }

-    private void checkNewestVersion() {
-        try {
-            final HttpURLConnection c = (HttpURLConnection) new URL("https://api.spigotmc.org/legacy/update.php?resource=40699").openConnection();
-            final BufferedReader reader = new BufferedReader(new InputStreamReader(c.getInputStream()));
+    private void checkNewestVersion() throws Exception {
+        final HttpURLConnection c = (HttpURLConnection) new URL("https://api.spigotmc.org/legacy/update.php?resource=40699").openConnection();
+        try (final BufferedReader reader = new BufferedReader(new InputStreamReader(c.getInputStream()))) {
            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) {
+            }
        }
    }

@@ -269,6 +291,7 @@ public abstract class MaintenancePlugin implements IMaintenance {
        runnable = null;
    }

+    @Nullable
    public UUID checkUUID(final SenderInfo sender, final String s) {
        final UUID uuid;
        try {
@@ -315,6 +338,7 @@ public abstract class MaintenancePlugin implements IMaintenance {
        return version.toString();
    }

+    @Nullable
    public List<String> getMaintenanceServersDump() {
        return isMaintenance() ? Arrays.asList("global") : null;
    }
@@ -331,6 +355,10 @@ public abstract class MaintenancePlugin implements IMaintenance {
        return prefix;
    }

+    /**
+     * @see #isTaskRunning()
+     */
+    @Nullable
    public MaintenanceRunnable getRunnable() {
        return runnable;
    }
@@ -355,8 +383,10 @@ public abstract class MaintenancePlugin implements IMaintenance {

    public abstract Task startMaintenanceRunnable(Runnable runnable);

+    @Nullable
    public abstract SenderInfo getOfflinePlayer(String name);

+    @Nullable
    public abstract SenderInfo getOfflinePlayer(UUID uuid);

    public abstract File getDataFolder();
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -22,16 +22,22 @@ import eu.kennytv.maintenance.api.ISettings;
 import eu.kennytv.maintenance.core.config.Config;
 import eu.kennytv.maintenance.core.config.ConfigSection;
 import eu.kennytv.maintenance.core.util.ServerType;
+import org.jetbrains.annotations.Nullable;

 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
-import java.util.*;
-import java.util.logging.Level;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.UUID;

 public class Settings implements ISettings {
-    private static final int CURRENT_CONFIG_VERSION = 3;
+    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<>();
@@ -59,8 +65,10 @@ public class Settings implements ISettings {
    public Settings(final MaintenancePlugin plugin, final String... unsupportedFields) {
        this.plugin = plugin;
        this.unsupportedFields = unsupportedFields;
-        if (!plugin.getDataFolder().exists())
+        if (!plugin.getDataFolder().exists()) {
+            updatePluginDirectory();
            plugin.getDataFolder().mkdirs();
+        }

        createFile("config.yml");
        createFile("WhitelistedPlayers.yml");
@@ -92,10 +100,17 @@ public class Settings implements ISettings {

        updateLanguageFile();

-        // Directly save colored messages
-        for (final Map.Entry<String, Object> entry : language.getValues().entrySet()) {
-            if (!(entry.getValue() instanceof String)) continue;
-            entry.setValue(getColoredString((String) entry.getValue()));
+        // Directly cache colored messages - this should not be saved!
+        transformColoredMessages(language.getValues());
+    }
+
+    private void transformColoredMessages(final Map<String, Object> map) {
+        for (final Map.Entry<String, Object> entry : map.entrySet()) {
+            if (entry.getValue() instanceof Map) {
+                transformColoredMessages((Map<String, Object>) entry.getValue());
+            } else if (entry.getValue() instanceof String) {
+                entry.setValue(getColoredString(replaceNewlineVar((String) entry.getValue())));
+            }
        }
    }

@@ -118,7 +133,7 @@ public class Settings implements ISettings {
            try (final InputStream in = plugin.getResource(from)) {
                Files.copy(in, file.toPath());
            } catch (final IOException e) {
-                throw new IllegalArgumentException("Unable to create " + name + " file for Maintenance!", e);
+                throw new RuntimeException("Unable to create " + name + " file for Maintenance!", e);
            }
        }
    }
@@ -132,17 +147,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();
            }
        }
    }
@@ -151,23 +168,27 @@ 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"));
+        }
+        playerCountHoverMessage = replaceNewlineVar(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();
        }
@@ -180,39 +201,33 @@ public class Settings implements ISettings {
                plugin.getLogger().warning("invalid WhitelistedPlayers entry: " + entry.getKey());
            }
        }
+
        loadExtraSettings();
    }

+    private void updatePluginDirectory() {
+        // All plugin identifiers were changed to 'Maintenance' ('maintenance' for Sponge and Velocity) in 3.0.5
+        // Don't worry, this is only checked if no plugin folder is found
+        String oldDirName = "Maintenance" + plugin.getServerType();
+        if (plugin.getServerType() == ServerType.SPONGE || plugin.getServerType() == ServerType.VELOCITY) {
+            oldDirName = oldDirName.toLowerCase();
+        }
+
+        final File oldDir = new File(plugin.getDataFolder().getParentFile(), oldDirName);
+        if (!oldDir.exists()) return;
+
+        try {
+            Files.move(oldDir.toPath(), plugin.getDataFolder().toPath());
+            plugin.getLogger().info("Moved old " + oldDirName + " to new " + plugin.getDataFolder().getName() + " directory!");
+        } catch (final IOException e) {
+            plugin.getLogger().severe("Error while copying " + oldDirName + " to new " + plugin.getDataFolder().getName() + " directory!");
+            e.printStackTrace();
+        }
+    }
+
    private void updateConfig() {
        boolean changed = false;

-        // 3.0 - update config format from 2.5
-        if (migrateConfig(new File(plugin.getDataFolder(), "bungee-config.yml"))
-                || migrateConfig(new File(plugin.getDataFolder(), "spigot-config.yml"))) {
-            // 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")))
-                    plugin.getLogger().info("Renamed old language file!");
-                else
-                    plugin.getLogger().warning("Could not rename old language file! Please rename/delete it yourself as soon as possible!");
-            }
-
-            changed = true;
-        }
-        // 3.0 - move SpigotServer.yml fields to config
-        if (plugin.getServerType() == ServerType.BUNGEE && migrateSpigotServersFile()) {
-            changed = true;
-        }
-        // 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")))
-                plugin.getLogger().info("Moved maintenance-icon from server directory to the plugin's directory!");
-            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)
        if (config.getInt("config-version") != CURRENT_CONFIG_VERSION) {
            plugin.getLogger().info("Updating config to latest version...");
@@ -241,16 +256,19 @@ public class Settings implements ISettings {
    }

    private void updateLanguageFile() {
-        final String s = "language-" + languageName;
+        final String filePrefix = "language-" + languageName;
        try {
-            createFile(s + "-new.yml", s + ".yml");
-        } catch (final IllegalArgumentException e) {
-            plugin.getLogger().warning("Couldn't update language file, as the " + s + ".yml wasn't found in the resource files!");
+            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(), s + "-new.yml");
+        final File file = new File(plugin.getDataFolder(), filePrefix + "-new.yml");
        final Config tempConfig = new Config(file);
        try {
            tempConfig.load();
@@ -265,70 +283,13 @@ public class Settings implements ISettings {
        if (updated) {
            try {
                language.save();
+                plugin.getLogger().info("Updated language file!");
            } catch (final IOException e) {
                e.printStackTrace();
-                return;
            }
-            plugin.getLogger().info("Updated language file!");
        }
    }

-    private boolean migrateConfig(final File file) {
-        if (!file.exists()) return false;
-
-        plugin.getLogger().info("Migrating old config to new format...");
-        final Config oldConfig = new Config(file);
-        try {
-            oldConfig.load();
-        } catch (final IOException e) {
-            plugin.getLogger().log(Level.WARNING, "Error while trying to migrate old config file");
-            e.printStackTrace();
-            return false;
-        }
-
-        if (oldConfig.contains("pingmessage"))
-            config.set("pingmessages", Arrays.asList(oldConfig.getString("pingmessage")));
-        if (oldConfig.contains("enable-maintenance-mode"))
-            config.set("maintenance-enabled", oldConfig.getBoolean("enable-maintenance-mode"));
-        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())
-            plugin.getLogger().warning("Could not delete old config file! Please delete it as soon as possible.");
-        else
-            plugin.getLogger().info("Updated to new config file!");
-        return true;
-    }
-
-    private boolean migrateSpigotServersFile() {
-        final File file = new File(plugin.getDataFolder(), "SpigotServers.yml");
-        if (!file.exists()) return false;
-
-        final Config oldFile = new Config(file);
-        try {
-            oldFile.load();
-        } catch (final IOException e) {
-            plugin.getLogger().log(Level.WARNING, "Error while trying to migrate old SpigotServers file");
-            e.printStackTrace();
-            return false;
-        }
-
-        if (oldFile.contains("maintenance-on"))
-            config.set("proxied-maintenance-servers", oldFile.getStringList("maintenance-on"));
-        if (oldFile.contains("fallback"))
-            config.set("fallback", oldFile.getString("fallback"));
-
-        oldFile.clear();
-        if (!file.delete())
-            plugin.getLogger().warning("Could not delete old SpigotServers.yml file! Please delete it as soon as possible.");
-        else
-            plugin.getLogger().info("Deleted old SpigotServers.yml file!");
-        return true;
-    }
-
    private static final String ALL_CODES = "0123456789AaBbCcDdEeFfKkLlMmNnOoRr";

    public String getColoredString(final String s) {
@@ -373,7 +334,7 @@ public class Settings implements ISettings {

    private String getPingMessage(final List<String> list) {
        final String s = list.size() == 1 ? list.get(0) : list.get(RANDOM.nextInt(list.size()));
-        return getColoredString(plugin.formatedTimer(s).replace("%NEWLINE%", "\n"));
+        return getColoredString(replaceNewlineVar(plugin.formatedTimer(s)));
    }

    @Override
@@ -417,6 +378,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;
@@ -472,13 +438,12 @@ public class Settings implements ISettings {
        return config;
    }

+    // The ping messages still contain the %NEWLINE% (if they have 2 lines)
    public List<String> getPingMessages() {
        return pingMessages;
    }

-    /**
-     * May be null
-     */
+    @Nullable
    public List<String> getTimerSpecificPingMessages() {
        return timerSpecificPingMessages;
    }
@@ -496,7 +461,7 @@ public class Settings implements ISettings {
    }

    public String getKickMessage() {
-        return plugin.formatedTimer(getMessage("kickmessage", "§cThe server is currently under maintenance!%NEWLINE%§cTry again later!").replace("%NEWLINE%", "\n"));
+        return plugin.formatedTimer(getMessage("kickmessage"));
    }

    public String getLanguage() {
@@ -507,6 +472,20 @@ public class Settings implements ISettings {
        return customPlayerCountMessage;
    }

+    /*
+     * Note on why this even exists: Yaml will force save all strings containing line breaks '\n' in this rather chunky format:
+     *   key: |-
+     *     First line text
+     *      Second line text.
+     *      ...
+     *
+     * This also happens to string lists, making those practically unreadable (in partciular the motd list), as well as confusing for most users in general.
+     * Because of this, I replace %NEWLINE% manually, to spare users from these ugly breaks.
+     */
+    protected String replaceNewlineVar(final String s) {
+        return s.replace("%NEWLINE%", "\n");
+    }
+
    protected void loadExtraSettings() {
    }
 }
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -21,6 +21,7 @@ package eu.kennytv.maintenance.core.command;
 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.Settings;
 import eu.kennytv.maintenance.core.util.SenderInfo;
+import org.jetbrains.annotations.Nullable;

 import java.util.Collections;
 import java.util.List;
@@ -30,7 +31,7 @@ public abstract class CommandInfo {
    private final String helpMessageKey;
    private final String permission;

-    protected CommandInfo(final MaintenancePlugin plugin, final String permission) {
+    protected CommandInfo(final MaintenancePlugin plugin, @Nullable final String permission) {
        this.plugin = plugin;
        this.permission = permission;
        // Just take the class name as the language key
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -83,10 +83,11 @@ public final class SetMotdCommand extends CommandInfo {
                    oldMessage.split("%NEWLINE%", 2)[0] + "%NEWLINE%" + message : oldMessage + "%NEWLINE%" + message;
        }

-        if (index > pingMessages.size())
+        if (index > pingMessages.size()) {
            pingMessages.add(newMessage);
-        else
+        } else {
            pingMessages.set(index - 1, newMessage);
+        }
        settings.getConfig().set(timerPingMessages ? "timerspecific-pingmessages" : "pingmessages", pingMessages);
        settings.saveConfig();
        sender.sendMessage(settings.getMessage("setMotd").replace("%LINE%", args[2]).replace("%INDEX%", args[1])
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -19,6 +19,7 @@
 package eu.kennytv.maintenance.core.config;

 import com.google.common.collect.Sets;
+import org.jetbrains.annotations.Nullable;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;

@@ -26,7 +27,11 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;

 /**
 * Further modified version of the SimpleConfig project of PSandro (https://github.com/PSandro/SimpleConfig).
@@ -54,6 +59,7 @@ public final class Config extends ConfigSection {
    private String header;

    public Config(final File file, final String... unsupportedFields) {
+        super(null, "");
        this.file = file;
        this.unsupportedFields = unsupportedFields.length == 0 ? Collections.emptySet() : Sets.newHashSet(unsupportedFields);
    }
@@ -63,26 +69,27 @@ public final class Config extends ConfigSection {
        final Map<String, Object> map = yaml.load(data);
        this.values = map != null ? map : new LinkedHashMap<>();
        this.comments = ConfigSerializer.deserializeComments(data);
-        if (comments.containsKey(".header"))
-            this.header = String.join("\n", comments.remove(".header"));
+
+        final String[] header = comments.remove(".header");
+        if (header != null) {
+            this.header = String.join("\n", header);
+        }

        final boolean removedFields = values.keySet().removeIf(key -> {
            final String[] split = key.split("\\.");
            String splitKey = "";
-            boolean remove = false;
            for (final String s : split) {
                splitKey += s;
                if (!unsupportedFields.contains(splitKey)) {
                    splitKey += ".";
                    continue;
                }
-                remove = true;
-                break;
-            }

-            if (remove)
+                // Unsupported field
                comments.remove(key);
-            return remove;
+                return true;
+            }
+            return false;
        });
        if (removedFields) {
            save();
@@ -90,10 +97,16 @@ public final class Config extends ConfigSection {
    }

    public void save() throws IOException {
-        final byte[] bytes = this.saveConfigToString().getBytes(StandardCharsets.UTF_8);
-        this.file.getParentFile().mkdirs();
-        this.file.createNewFile();
-        Files.write(this.file.toPath(), bytes);
+        saveTo(file);
+    }
+
+    public void saveTo(final File file) throws IOException {
+        final byte[] bytes = toString().getBytes(StandardCharsets.UTF_8);
+        if (file.getParentFile() != null) {
+            file.getParentFile().mkdirs();
+        }
+        file.createNewFile();
+        Files.write(file.toPath(), bytes);
    }

    public boolean addMissingFields(final Map<String, Object> fields, final Map<String, String[]> comments) {
@@ -122,35 +135,15 @@ public final class Config extends ConfigSection {
        return changed;
    }

-    @Override
-    public void set(final String key, final Object value, final String... comments) {
-        if (value == null) {
-            remove(key);
-        } else {
-            this.values.put(key, value);
-            this.comments.put(key, comments);
-        }
-    }
-
-    @Override
-    public void remove(final String key) {
-        this.values.remove(key);
-        this.comments.remove(key);
-    }
-
    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
+        options.setWidth(10_000); // be sneaky because autobreak on saving looks disgusting
        return new Yaml(options);
    }

-    public String saveConfigToString() {
-        return ConfigSerializer.serialize(this.header, this.values, this.comments, this.yaml);
-    }
-
    public void clear() {
        this.values.clear();
        this.comments.clear();
@@ -165,6 +158,12 @@ public final class Config extends ConfigSection {
        return unsupportedFields;
    }

+    @Override
+    public Config getRoot() {
+        return this;
+    }
+
+    @Nullable
    public String getHeader() {
        return header;
    }
@@ -172,4 +171,9 @@ public final class Config extends ConfigSection {
    public void resetAwesomeHeader() {
        this.header = AWESOME_HEADER;
    }
+
+    @Override
+    public String toString() {
+        return ConfigSerializer.serialize(this.header, this.values, this.comments, this.yaml);
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -18,6 +18,8 @@

 package eu.kennytv.maintenance.core.config;

+import org.jetbrains.annotations.Nullable;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -30,31 +32,57 @@ import java.util.Set;
 */
 public class ConfigSection {

+    protected final Config root;
+    protected final String currentPath;
    protected Map<String, Object> values;

-    ConfigSection() {
-        this(new HashMap<>());
+    ConfigSection(final Config root, final String currentPath) {
+        this(root, currentPath, new HashMap<>());
    }

-    ConfigSection(final Map<String, Object> values) {
+    ConfigSection(final Config root, final String currentPath, final Map<String, Object> values) {
+        this.root = root;
+        this.currentPath = currentPath;
        this.values = values;
    }

+    @Nullable
    public <E> E get(final String key) {
-        return (E) this.values.get(key);
+        return (E) getObject(key);
    }

-    public <E> E get(final String key, final E def) {
-        final Object o = this.values.get(key);
+    @Nullable
+    public <E> E get(final String key, @Nullable final E def) {
+        final Object o = getObject(key);
        return o != null ? (E) o : def;
    }

+    @Nullable
    public Object getObject(final String key) {
-        return this.values.get(key);
+        return getObject(key, null);
    }

-    public <E> E getOrSet(final String key, final E def) {
-        final Object o = this.values.get(key);
+    @Nullable
+    public Object getObject(final String key, final Object def) {
+        int i1 = -1;
+        int i2;
+        ConfigSection section = this;
+        while ((i1 = key.indexOf('.', i2 = i1 + 1)) != -1) {
+            section = section.getSection(key.substring(i2, i1));
+            if (section == null) return def;
+        }
+
+        final String subKey = key.substring(i2);
+        if (section == this) {
+            final Object result = values.get(subKey);
+            return result != null ? result : def;
+        }
+        return section.getObject(subKey, def);
+    }
+
+    @Nullable
+    public <E> E getOrSet(final String key, @Nullable final E def) {
+        final Object o = getObject(key);
        if (o != null) {
            return (E) o;
        } else {
@@ -63,50 +91,29 @@ public class ConfigSection {
        }
    }

-    /**
-     * 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]);
-    }
-
+    @Nullable
    public ConfigSection getSection(final String key) {
        final Object o = getObject(key);
-        return o instanceof Map ? new ConfigSection((Map<String, Object>) o) : null;
+        if (!(o instanceof Map)) return null;
+        return new ConfigSection(getRoot(), getFullKeyInPath(key), (Map<String, Object>) o);
    }

    public boolean contains(final String key) {
-        return this.values.containsKey(key);
+        return getObject(key) != null;
    }

-    public void set(final String key, final Object value) {
+    public void set(final String key, @Nullable final Object value) {
+        //TODO go deep if necessary
        if (value == null) {
-            remove(key);
-        } else
-            this.values.put(key, value);
-    }
-
-    public void set(final String key, final Object value, final String... comments) {
-        if (value == null) {
-            remove(key);
+            values.remove(key);
+            getRoot().getComments().remove(getFullKeyInPath(key));
        } else {
-            this.values.put(key, value);
+            values.put(key, value);
        }
    }

    public void remove(final String key) {
-        this.values.remove(key);
+        set(key, null);
    }

    public Set<String> getKeys() {
@@ -122,16 +129,18 @@ public class ConfigSection {
    }

    public boolean getBoolean(final String key, final boolean def) {
-        final Object o = values.get(key);
+        final Object o = getObject(key);
        return o instanceof Boolean ? (boolean) o : def;
    }

+    @Nullable
    public String getString(final String key) {
        return get(key);
    }

-    public String getString(final String key, final String def) {
-        final Object o = get(key);
+    @Nullable
+    public String getString(final String key, @Nullable final String def) {
+        final Object o = getObject(key);
        return o instanceof String ? (String) o : def;
    }

@@ -140,7 +149,7 @@ public class ConfigSection {
    }

    public int getInt(final String key, final int def) {
-        final Object o = values.get(key);
+        final Object o = getObject(key);
        return o instanceof Number ? ((Number) o).intValue() : def;
    }

@@ -149,7 +158,7 @@ public class ConfigSection {
    }

    public double getDouble(final String key, final double def) {
-        final Object o = values.get(key);
+        final Object o = getObject(key);
        return o instanceof Number ? ((Number) o).doubleValue() : def;
    }

@@ -158,23 +167,47 @@ public class ConfigSection {
    }

    public long getLong(final String key, final long def) {
-        final Object o = values.get(key);
+        final Object o = getObject(key);
        return o instanceof Number ? ((Number) o).longValue() : def;
    }

+    @Nullable
    public List<String> getStringList(final String key) {
        return get(key);
    }

-    public List<String> getStringList(final String key, final List<String> def) {
-        return values.containsKey(key) ? get(key) : def;
+    @Nullable
+    public List<String> getStringList(final String key, @Nullable final List<String> def) {
+        final List<String> list = get(key);
+        return list != null ? list : def;
    }

+    @Nullable
    public List<Integer> getIntList(final String key) {
        return get(key);
    }

-    public List<Integer> getIntList(final String key, final List<Integer> def) {
-        return values.containsKey(key) ? get(key) : def;
+    @Nullable
+    public List<Integer> getIntList(final String key, @Nullable final List<Integer> def) {
+        final List<Integer> list = get(key);
+        return list != null ? list : def;
+    }
+
+    /**
+     * @return root config
+     */
+    public Config getRoot() {
+        return root;
+    }
+
+    /**
+     * @return current path, or empty string if root
+     */
+    public String getCurrentPath() {
+        return currentPath;
+    }
+
+    protected String getFullKeyInPath(final String key) {
+        return currentPath.isEmpty() ? key : currentPath + "." + key;
    }
 }
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -40,7 +40,9 @@ public final class ConfigSerializer {
    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);
+        if (data.isEmpty()) {
+            return yaml.dump(null);
+        }

        final String rawYaml = yaml.dump(data);
        final StringBuilder fileData = new StringBuilder();
@@ -61,46 +63,59 @@ public final class ConfigSerializer {
                key = join(array, array.length - backspace);
                keyLine = true;
            } else {
-                keyLine = line.contains(":");
+                keyLine = line.indexOf(':') != -1;
            }

-            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;
+            if (!keyLine) {
+                // Nothing to do, go to next line
+                fileData.append(line).append('\n');
+                continue;
+            }

+            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;
+
+            // Add comments if present
+            if (comments != null) {
                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())
+                        if (comment.isEmpty()) {
                            fileData.append('\n');
-                        else
+                        } else {
                            fileData.append(indentText).append(comment).append('\n');
+                        }
                    }
                }
-
-                currentKeyIndents = indents;
            }

+            currentKeyIndents = indents;
            fileData.append(line).append('\n');
        }
        return header != null && !header.isEmpty() ? header + fileData : fileData.toString();
    }

    public static Map<String, String[]> deserializeComments(final String data) {
+        //TODO go through known yaml keys and figure out comments from there instead of from line to line?
        final Map<String, String[]> comments = new HashMap<>();
        final List<String> currentComments = new ArrayList<>();
        boolean header = true;
+        boolean multiLineValue = false;
        int currentIndents = 0;
        String key = "";
        for (final String line : data.split("\n")) {
            final String s = line.trim();
+            // It's a comment!
            if (s.startsWith("#")) {
                currentComments.add(s);
                continue;
            }
+
+            // Header is over - save it!
            if (header) {
                if (!currentComments.isEmpty()) {
                    currentComments.add("");
@@ -109,21 +124,39 @@ public final class ConfigSerializer {
                }
                header = false;
            }
+
+            // Save empty lines as well
            if (s.isEmpty()) {
                currentComments.add(s);
                continue;
            }

+            // Multi line values?
+            if (s.startsWith("- |")) {
+                multiLineValue = true;
+                continue;
+            }
+
            final int indent = getIndents(line);
            final int indents = indent / INDENT_UNIT;
+            // Check if the multi line value is over
+            if (multiLineValue) {
+                if (indents > currentIndents) continue;
+
+                multiLineValue = false;
+            }
+
+            // Check if this is a level lower
            if (indents <= currentIndents) {
                final String[] array = key.split(PATH_SEPARATOR_QUOTED);
                final int backspace = currentIndents - indents + 1;
-                key = join(array, array.length - backspace);
+                final int delta = array.length - backspace;
+                key = delta >= 0 ? join(array, delta) : key;
            }

+            // Finish current key
            final String separator = key.isEmpty() ? "" : PATH_SEPARATOR_STRING;
-            final String lineKey = line.contains(":") ? line.split(Pattern.quote(":"))[0] : line;
+            final String lineKey = line.indexOf(':') != -1 ? line.split(Pattern.quote(":"))[0] : line;
            key += separator + lineKey.substring(indent);
            currentIndents = indents;

@@ -138,8 +171,11 @@ public final class ConfigSerializer {
    private static int getIndents(final String line) {
        int count = 0;
        for (int i = 0; i < line.length(); i++) {
-            if (line.charAt(i) == ' ') count++;
-            else break;
+            if (line.charAt(i) != ' ') {
+                break;
+            }
+
+            count++;
        }
        return count;
    }
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -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) {
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -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();
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -18,33 +18,35 @@

 package eu.kennytv.maintenance.core.util;

+import com.google.common.base.Preconditions;
+import org.jetbrains.annotations.Nullable;
+
 public final class Version implements Comparable<Version> {
    private final int[] parts;
    private final String version;
    private final String tag;

+    /**
+     * Creates a new version object to be compared.
+     * The version format are numbers separated by '.', possibly followed by a '-' to include an extra tag after it.
+     *
+     * @param version string representation of the version
+     * @throws IllegalArgumentException if the given version string is null or empty
+     * @throws NumberFormatException    if there are non-number characters in the version (before the tag)
+     */
    public Version(final String version) {
-        if (version == null || version.isEmpty()) {
-            this.version = "";
-            tag = "";
-            parts = new int[0];
-            System.out.println("Unknown Maintenance version detected!");
-            return;
-        }
-        final String[] split = version.split("-", 2)[0].split("\\.");
+        Preconditions.checkArgument(version != null && !version.isEmpty());
+
+        final int index = version.indexOf('-');
+        final String[] split = (index == -1 ? version : version.substring(0, index)).split("\\.");
        parts = new int[split.length];
        for (int i = 0; i < split.length; i++) {
-            if (!split[i].matches("[0-9]+")) {
-                this.version = "";
-                tag = "";
-                System.out.println("Unknown Maintenance version detected!");
-                return;
-            }
+            // Let this throw an exception if parsing fails
            parts[i] = Integer.parseInt(split[i]);
        }

        this.version = version;
-        tag = version.contains("-") ? version.split("-", 2)[1] : "";
+        tag = index != -1 ? version.substring(index + 1) : "";
    }

    /**
@@ -54,20 +56,25 @@ public final class Version implements Comparable<Version> {
     * @return 0 if they are the same, 1 if this instance is newer, -1 if older
     */
    @Override
-    public int compareTo(final Version version) {
-        if (version == null || version.toString() == null) return 0;
+    public int compareTo(@Nullable final Version version) {
+        if (version == null) return 0;
+
        final int max = Math.max(this.parts.length, version.parts.length);
        for (int i = 0; i < max; i++) {
            final int partA = i < this.parts.length ? this.parts[i] : 0;
            final int partB = i < version.parts.length ? version.parts[i] : 0;
-            if (partA < partB) return -1;
-            if (partA > partB) return 1;
+            if (partA < partB) {
+                return -1;
+            } else if (partA > partB) {
+                return 1;
+            }
        }

-        if (this.tag.isEmpty() && !version.tag.isEmpty())
+        if (this.tag.isEmpty() && !version.tag.isEmpty()) {
            return 1;
-        if (!this.tag.isEmpty() && version.tag.isEmpty())
+        } else if (!this.tag.isEmpty() && version.tag.isEmpty()) {
            return -1;
+        }
        return 0;
    }

@@ -82,7 +89,9 @@ public final class Version implements Comparable<Version> {

    @Override
    public boolean equals(final Object o) {
-        if (o == null) return false;
-        return o instanceof Version && o == this || version.equals(o.toString());
+        if (o == this) return true;
+        if (!(o instanceof Version)) return false;
+        final Version other = (Version) o;
+        return version.equals(other.version);
    }
 }
@@ -17,11 +17,15 @@ proxied-maintenance-servers:
  - SpigotServer1
 # - AnotherServer

-# If maintenance is enabled on a proxied server with players on it,
-# they will be sent to the fallback server instead of being kicked off the network.
+# If maintenance is enabled on a proxied server with players on it, they will be sent to the fallback server instead of being kicked off the network.
 # If the fallback server is not reachable/not set, they will just be kicked off the network.
+# This can also be set to an array to set multiple fallback servers, in case one server is not always reachable: 'fallback: [s1, s2, s3, ...]'
 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).
@@ -39,7 +43,7 @@ timerspecific-pingmessages:
 # If set to true, the message below will be shown at the top right corner of the server in the serverlist, where the playercount would normally be displayed.
 # If set to false, the normal playercount will be shown.
 #
-# Alternatively you can use '%ONLINE%' and '%MAX% if you want to include the playercount in a custom message (e.g. "&cMaintenance &7%ONLINE%&8/&7%MAX%").
+# Alternatively you can use '%ONLINE%' and '%MAX%' if you want to include the playercount in a custom message (e.g. "&cMaintenance &7%ONLINE%&8/&7%MAX%").
 enable-playercountmessage: true
 playercountmessage: "&4Maintenance"

@@ -59,7 +63,8 @@ send-join-notification: false
 kick-online-players: true

 # Changes the language of command feedback/messages.
-# Currently available are: en (English), de (German), fr (French), pt (Portuguese), es (Spanish)
+# If you find missing translations or want to contribute a new language file, you are very welcome to message me on Spigot or my Discord server! :)
+# Currently available are: en (English), de (German), fr (French), pt (Portuguese), es (Spanish), ru (Russian), zh (Chinese), it (Italian)
 language: en

 # If you have 2 or more proxy instances, the database connection will make sure all proxies
@@ -77,6 +82,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.
@@ -95,4 +102,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: 3
+config-version: 4
@@ -43,7 +43,10 @@ playerNotOnline: "&8[&eMaintenance&8] &cEs ist momentan kein Spieler mit diesem
 invalidUuid: "&8[&eMaintenance&8] &cUngültiges UUID Format!"

 # 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."
@@ -43,7 +43,10 @@ playerNotOnline: "&8[&eMaintenance&8] &cThere is no player online with that name
 invalidUuid: "&8[&eMaintenance&8] &cInvalid uuid format!"

 # 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."
@@ -43,7 +43,10 @@ playerNotOnline: "&8[&eMaintenance&8] &7No hay jugador en línea con ese nombre.
 invalidUuid: "&8[&eMaintenance&8] &cFormato inválido!"

 # 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."
@@ -43,7 +43,10 @@ playerNotOnline: "&8[&eMaintenance&8] &cIl n'y a pas de joueur en ligne avec ce
 invalidUuid: "&8[&eMaintenance&8] &cLe format de l'uuid est invalide!"

 # 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."
@@ -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: "&cNon hai i permessi necessari per eseguire quel comando."
+kickmessage: "&cIl server è momentaneamente in manutenzione!%NEWLINE%&cRiprova più tardi!"
+maintenanceActivated: "&8[&eMaintenance&8] &6Modalità manutenzione ora attivata."
+maintenanceDeactivated: "&8[&eMaintenance&8] &6Modalità manutenzione ora disattivata."
+alreadyEnabled: "&8[&eMaintenance&8] &cLa modalità manutenzione è già attiva!"
+alreadyDisabled: "&8[&eMaintenance&8] &cLa modalità mantenzione è già disattivata!"
+endtimerBroadcast: "&8[&eMaintenance&8] &7La modalità manutenzione verrà disattivata tra &6%TIME%&7."
+endtimerStarted: "&8[&eMaintenance&8] &aTimer avviato: &7La modalità manutenzione verrà disattivata tra &6%TIME%&7."
+starttimerBroadcast: "&8[&eMaintenance&8] &7La modalità manutenzione verrà attivata tra &6%TIME%&7."
+starttimerStarted: "&8[&eMaintenance&8] &aTimer avviato: &7La modalità manutenzione verrà attivata tra &6%TIME%&7."
+timerAlreadyRunning: "&8[&eMaintenance&8] &cC'è già un timer programmato!"
+timerNotRunning: "&8[&eMaintenance&8] &cNon c'è nessun timer attivo al momento."
+timerCancelled: "&8[&eMaintenance&8] &cIl timer attuale è stato disattivato."
+timerTooLong: "&8[&eMaintenance&8] &cIl numero deve essere inferiore a 40320 (28 giorni)!"
+timerMotdDisabled: "&8[&eMaintenance&8] &cDevi impostare 'enable-timerspecific-messages' nella config su 'true', se desideri usare/modificare motds specifiche di un timer."
+motdTimer: "%HOURS%:%MINUTES%:%SECONDS%"
+motdTimerNotRunning: "-"
+joinNotification: "&8[&eMaintenance&8] &e%PLAYER% &cha tentato di accedere al server."
+motdList: "&8[&eMaintenance&8] &7Lista delle tue motds di manutenzione:"
+motdListEmpty: "8[&eMaintenance&8] &cNon hai ancora nessuna motds di manutenzione!"
+reload: "&8[&eMaintenance&8] &aRicaricata config, whitelistedplayers, file dei linguaggi e la icona di manutenzione."
+removedMotd: "&8[&eMaintenance&8] &aRimossa motd numero %INDEX%."
+removeMotdError: "&8[&eMaintenance&8] &cHai soltanto una motd, quindi non puoi rimuoverla!"
+setMotd: "&8[&eMaintenance&8] &aImpostata linea %LINE% in %INDEX%. motd manutenzione a %MOTD%"
+setMotdIndexError: "&8[&eMaintenance&8] &cHai attualmente %MOTDS% motds, quindi devi scegliere un numero fra 1 e %NEWAMOUNT%."
+setMotdLineError: "&8[&eMaintenance&8] &cIl secondo argomento deve corrispondere alla linea (1 o 2)!"
+updateDownloading: "&8[&eMaintenance&8] &c&lScaricando aggiornamento..."
+updateFailed: "&8[&eMaintenance&8] &4&lAggiornamento non riuscito!"
+updateFinished: "&8[&eMaintenance&8] &a&lL'aggiornamento è completato! Per prevenire problemi e completare l'aggiornamento dovresti riavviare il server!"
+whitelistedPlayers: "&8[&eMaintenance&8] &6Player in whitelist per la manutenzione:"
+whitelistedPlayersFormat: "&8- &e%NAME% &8(&7%UUID%&8)"
+whitelistAdded: "&8[&eMaintenance&8] &aAggiunto &b%PLAYER% &aalla whitelist della manutenzione!"
+whitelistAlreadyAdded: "&8[&eMaintenance&8] &b%PLAYER% &cè già nella whitelist della manutenzione!"
+whitelistRemoved: "&8[&eMaintenance&8] &aRimosso &b%PLAYER% &adalla lista della manutenzione!"
+whitelistNotFound: "&8[&eMaintenance&8] &cQuesto giocatore non fa parte della whitelist della manutenzione!"
+whitelistEmpty: "&8[&eMaintenance&8] &cLa whitelist di manutenzione è vuota! Usa &e/maintenance add <player/uuid> &cper aggiungere qualcuno!"
+playerNotFound: "&8[&eMaintenance&8] &cNessun giocatore con questo username è mai entrato nel server."
+playerNotFoundUuid: "&8[&eMaintenance&8] &cNessun player con quell'uuid è stato trovato."
+playerNotOnline: "&8[&eMaintenance&8] &cNon c'è nessun giocatore online con quell'username."
+invalidUuid: "&8[&eMaintenance&8] &cL'uuid presenta un formato invalido!"
+
+# Messages for the Bungee/Velocity part, just can ignore them if you use the plugin on Spigot/Sponge
+sentToWaitingServer: "&8[&eMaintenance&8] &cSei stato inviato su un server d'attesa!"
+forceWaitingServer: "&8[&eMaintenance&8] &cNon puoi abbandonare il server d'attesa durante una manutenzione!"
+serverNotFound: "&8[&eMaintenance&8] &cNessun server con questo nome è registrato sulla proxy!"
+
+singleTimerAlreadyRunning: "&8[&eMaintenance&8] &cÈ già presente un timer pianificato per quel server!"
+singleTimerCancelled: "&8[&eMaintenance&8] &cIl timer attuale per il server &e%SERVER% &cè stato rimosso."
+singleTimerNotRunning: "&8[&eMaintenance&8] &cNon c'è nessun timer correntemente attivo per quel server."
+singleEndtimerBroadcast: "&8[&eMaintenance&8] &7La modalità manutenzione per il server %SERVER% verrà disabilitata tra &6%TIME%&7."
+singleStarttimerBroadcast: "&8[&eMaintenance&8] &7La modalità manutenzione per il server %SERVER% verrà disabilitata tra &6%TIME%&7."
+singleMaintenanceKick: "&8[&eMaintenance&8] &cIl server %SERVER% è in manutenzione al momento! Ritenta più tardi!"
+singleMaintenanceKickComplete: "&cIl server %SERVER% è in manutenzione!%NEWLINE%&cProva a rientrare per accedere ad un'altro server!"
+singleMaintenanceActivated: "&8[&eMaintenance&8] &6La modalità manutenzione è ora attiva sul server &e%SERVER%&6."
+singleMaintenanceDeactivated: "&8[&eMaintenance&8] &6La modalità manutenzione è ora disattivata sul server &e%SERVER%&6."
+singleServerAlreadyEnabled: "&8[&eMaintenance&8] &cLa modalità manutenzione è già attiva sul server &e%SERVER%&c!"
+singleServerAlreadyDisabled: "&8[&eMaintenance&8] &cLa modalità manutenzione è già disattivata sul server &e%SERVER%&c!"
+singleServerMaintenanceList: "&8[&eMaintenance&8] &7Servers sotto proxy che hanno la modalità manutenzione attiva:"
+singleServerMaintenanceListEmpty: "&8[&eMaintenance&8] &7Nessun server sotto proxy ha la modalità manutenzione attiva."
+
+second: "secondo"
+seconds: "secondi"
+minute: "minuto"
+minutes: "minuti"
+hour: "ora"
+hours: "ore"
+
+helpHeader: "&8========[ &e%NAME% &8| &e%PAGE%/%MAX% &8]========"
+helpPageNotFound: "&8[&eMaintenance&8] &cNon c'è alcuna pagina con quel numero!"
+helpNextPage: "&7Usa &b/maintenance help %PAGE% &7per andare alla prossima pagina d'aiuto."
+helpAbortTimer: "&6/maintenance aborttimer &7(Se attivo, l'attuale timer verrà fermato)"
+helpEndtimer: "&6/maintenance endtimer <minutes> &7(Dopo il tempo fornito in minuti, la modalità manutenzione sarà rimossa)"
+helpStarttimer: "&6/maintenance starttimer <minutes> &7(Dopo il tempo fornito in minuti, la modalità manutenzione sarà attivata)"
+helpDump: "&6/maintenance dump &7(Copia alcune informazioni dal server, usato per segnalare problemi)"
+helpHelp: "&6/maintenance help [page] &7(Mostra questa fantastica pagina d'aiuto)"
+helpMotd: "&6/maintenance motd [timer] &7(Elenca le attuali motds di manutenzione impostate. Se specifichi 'timer', verranno mostrati i motds dei timer)"
+helpRemoveMotd: "&6/maintenance removemotd [timer] <index> &7(Rimuove una motd di manutenzione. Se specifichi 'timer' come argomento, un messaggio specifico al timer verrà rimosso)"
+helpSetMotd: "&6/maintenance setmotd [timer] <index> <1/2> <message> &7(Imposta il motd per la manutenzione. Se specifichi 'timer' come argomento, un messaggio specifico al timer verrà impostato)"
+helpReload: "&6/maintenance reload &7(Ricarica il file di configurazione, whitelist server e icona)"
+helpToggle: "&6/maintenance <on/off> &7(Abilita/Disabilita modalità manutenzione)"
+helpUpdate: "&6/maintenance update &7(Scarica dall'esterno l'ultima versione del plugin nel server)"
+helpWhitelist: "&6/maintenance whitelist &7(Elenca tutti i giocatori nella whitelist per la manutenzione)"
+helpWhitelistAdd: "&6/maintenance add <name/uuid> &7(Aggiunge il giocatore alla whitelist di manutenzione, così possono entrare in un server durante la manutenzione)"
+helpWhitelistRemove: "&6/maintenance remove <name/uuid> &7(Rimuovi il player dalla whitelist della manutenzione)"
+
+# Messages for the Bungee/Velocity part, just can ignore them if you use the plugin on Spigot/Sponge
+helpAbortSingleTimer: "&6/maintenance aborttimer [server] &7(Se attivo, il timer attuale verrà fermato)"
+helpSingleEndtimer: "&6/maintenance endtimer [server] <minutes> &7(Dopo il tempo fornito in minuti, la modalità manutenzione sarà rimossa)"
+helpSingleStarttimer: "&6/maintenance starttimer [server] <minutes> &7(Dopo il tempo fornito in minuti, la modalità manutenzione sarà attivata)"
+helpSingleToggle: "&6/maintenance <on/off> [server] &7(Abilita/Disabilita la modalità manutenzione)"
+helpStatus: "&6/maintenance status &7(Elenca tutti i server sotto proxy che hanno la modalità manutenzione attiva)"
@@ -15,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%."
 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,7 +43,10 @@ playerNotOnline: "&8[&cManutencao&8] &cNao esta ninguem online com esse nome"
 invalidUuid: "&8[&eMaintenance&8] &cFormato de uuid invalido!"

 # 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!"
@@ -67,25 +70,25 @@ 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% &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)"
+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(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)"
+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)"
@@ -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: "&cВы были перемещены в лобби!"
+forceWaitingServer: "&cВы не можете покинуть лобби во время технических работ!"
+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Список всех серверов закрытых на технические работы."
@@ -0,0 +1,95 @@
+# Maintenance 插件由 KennyTV 开发
+# 简体中文由 RinAfter 提供
+# 如果你不清楚请不要删除 '%' 之间的单词
+
+noPermission: "&c你没有执行该命令的权限。"
+kickmessage: "&c服务器正在维护！%NEWLINE%&c请稍后再试！"
+maintenanceActivated: "&8[&eMaintenance&8] &6维护模式已启用。"
+maintenanceDeactivated: "&8[&eMaintenance&8] &6维护模式已停用。"
+alreadyEnabled: "&8[&eMaintenance&8] &c维护模式已开启。"
+alreadyDisabled: "&8[&eMaintenance&8] &c维护模式已关闭！"
+endtimerBroadcast: "&8[&eMaintenance&8] &7维护模式将在&6%TIME%&7后关闭"
+endtimerStarted: "&8[&eMaintenance&8] &a开始计时: &7维护模式将在&6%TIME%&7后关闭"
+starttimerBroadcast: "&8[&eMaintenance&8] &7维护模式将在&6%TIME%&7后开启"
+starttimerStarted: "&8[&eMaintenance&8] &a开始计时: &7维护模式将在&6%TIME%&7后开启。"
+timerAlreadyRunning: "&8[&eMaintenance&8] &c当前已有计时正在执行！"
+timerNotRunning: "&8[&eMaintenance&8] &c当前没有正在运行的计时器。"
+timerCancelled: "&8[&eMaintenance&8] &c当前计时器已中止。"
+timerTooLong: "&8[&eMaintenance&8] &c数值必须小于40320(28天)！"
+timerMotdDisabled: "&8[&eMaintenance&8] &c如果要使用/编辑特定于计时器的MOTD，你必须在Config.yml配置中将'enable-timerspecific-messages'设置为'true'"
+motdTimer: "%HOURS%:%MINUTES%:%SECONDS%"
+motdTimerNotRunning: "-"
+joinNotification: "&8[&eMaintenance&8] &e%PLAYER%&c试图加入服务器。"
+motdList: "&8[&eMaintenance&8] &7当前维护模式MOTD:"
+motdListEmpty: "8[&eMaintenance&8] &c你没有配置维护模式MOTD!"
+reload: "&8[&eMaintenance&8] &a重新加载配置、维护玩家白名单、语言文件和维护图标"
+removedMotd: "&8[&eMaintenance&8] &a删除第%INDEX%条维护模式MOTD"
+removeMotdError: "&8[&eMaintenance&8] &c你只有一条维护模式MOTD，所有你不能再删除任何MOTD！"
+setMotd: "&8[&eMaintenance&8] &a设置第%INDEX%条第%LINE%行维护模式MOTD为%MOTD%"
+setMotdIndexError: "&8[&eMaintenance&8] &c你现在有%MOTDS%条MOTD，所以你必须选择一个介于1和%NEWAMOUNT%之间的数字。"
+setMotdLineError: "&8[&eMaintenance&8] &c第二个参数必须是行号(1或2)！"
+updateDownloading: "&8[&eMaintenance&8] &c&l正在下载更新..."
+updateFailed: "&8[&eMaintenance&8] &4&l更新失败！"
+updateFinished: "&8[&eMaintenance&8] &a&l插件更新成功！为了防止任务出现问题并完成更新，你必须重新启动服务器！"
+whitelistedPlayers: "&8[&eMaintenance&8] &6维护玩家白名单:"
+whitelistedPlayersFormat: "&8- &e%NAME% &8(&7%UUID%&8)"
+whitelistAdded: "&8[&eMaintenance&8] &a将&b%PLAYER%&a添加到维护玩家白名单！"
+whitelistAlreadyAdded: "&8[&eMaintenance&8] &c玩家&b%PLAYER%&c已在维护玩家白名单中！"
+whitelistRemoved: "&8[&eMaintenance&8] &a从维护玩家白名单中删除&b%PLAYER%&a！"
+whitelistNotFound: "&8[&eMaintenance&8] &c此玩家不在维护玩家白名单中！"
+whitelistEmpty: "&8[&eMaintenance&8] &c维护玩家白名单为空！使用&e/maintenance add <player/uuid> &c添加某人！"
+playerNotFound: "&8[&eMaintenance&8] &c此服务器上从未出现该名称的玩家"
+playerNotFoundUuid: "&8[&eMaintenance&8] &c找不到具有该UUID的玩家。"
+playerNotOnline: "&8[&eMaintenance&8] &c没有使用该名称的在线玩家"
+invalidUuid: "&8[&eMaintenance&8] &c无效的UUID格式！"
+
+# Bungee/Velocity消息，如果在Spigot/Sponge上使用则可忽略以下内容
+sentToWaitingServer: "&8[&eMaintenance&8] &c您已被传送到等待服务器！"
+forceWaitingServer: "&8[&eMaintenance&8] &c启用维护时，您不能离开等待服务器！"
+serverNotFound: "&8[&eMaintenance&8] &c未找到拥有此名称的服务器！"
+
+singleTimerAlreadyRunning: "&8[&eMaintenance&8] &c该服务器已有计时器正在运行！"
+singleTimerCancelled: "&8[&eMaintenance&8] &c服务器&e%SERVER%&c的计时器已中止"
+singleTimerNotRunning: "&8[&eMaintenance&8] &c该服务器当前没有正在运行的计时器。"
+singleEndtimerBroadcast: "&8[&eMaintenance&8] &7服务器%SERVER%的维护模式将在&6%TIME%&7后关闭。"
+singleStarttimerBroadcast: "&8[&eMaintenance&8] &7服务器%SERVER%的维护模式将在&6%TIME%&7后开启。"
+singleMaintenanceKick: "&8[&eMaintenance&8] &c服务器%SERVER%正在维护！请稍后再试！"
+singleMaintenanceKickComplete: "&c服务器%SERVER%正在维护！%NEWLINE%&c你可以尝试重新加入另一个服务器！"
+singleMaintenanceActivated: "&8[&eMaintenance&8] &6服务器&e%SERVER%&6的维护模式已启用。"
+singleMaintenanceDeactivated: "&8[&eMaintenance&8] &6服务器&e%SERVER%&6的维护模式已停用。"
+singleServerAlreadyEnabled: "&8[&eMaintenance&8] &c服务器&e%SERVER%&c的维护模式已开启！"
+singleServerAlreadyDisabled: "&8[&eMaintenance&8] &c服务器&e%SERVER%&c的维护模式已关闭！"
+singleServerMaintenanceList: "&8[&eMaintenance&8] &7已开启维护的服务器有:"
+singleServerMaintenanceListEmpty: "&8[&eMaintenance&8] &7没有正在维护的服务器"
+
+second: "秒"
+seconds: "秒"
+minute: "分钟"
+minutes: "分钟"
+hour: "小时"
+hours: "小时"
+
+helpHeader: "&8========[ &e%NAME% &8| &e%PAGE%/%MAX% &8]========"
+helpPageNotFound: "&8[&eMaintenance&8] &c没有此页码的帮助页！"
+helpNextPage: "&7使用&b/maintenance help %PAGE% &7切换到下一帮助页"
+helpAbortTimer: "&6/maintenance aborttimer &7(中止当前开启的计时器)"
+helpEndtimer: "&6/maintenance endtimer <minutes> &7(在以分钟为单位给定时间后将关闭维护模式)"
+helpStarttimer: "&6/maintenance starttimer <minutes> &7(在以分钟为单位给定时间后将开启维护模式)"
+helpDump: "&6/maintenance dump &7(转储一些服务器信息，用于错误报告)"
+helpHelp: "&6/maintenance help [page] &7(显示帮助信息)"
+helpMotd: "&6/maintenance motd [timer] &7(显示当前设置的维护模式MOTD。如果指定'timer'，则显示计时器MOTD)"
+helpRemoveMotd: "&6/maintenance removemotd [timer] <index> &7(删除维护模式的MOTD。如果使用'timer'参数，将设置计时器特定的Ping消息)"
+helpSetMotd: "&6/maintenance setmotd [timer] <index> <1/2> <message> &7(设置维护模式的MOTD。如果使用'timer'参数，将设置计时器特定的Ping消息)"
+helpReload: "&6/maintenance reload &7(重新加载配置、维护玩家白名单、语言文件和维护图标)"
+helpToggle: "&6/maintenance <on/off> &7(开启/关闭维护模式)"
+helpUpdate: "&6/maintenance update &7(远程下载最新版本插件到服务器)"
+helpWhitelist: "&6/maintenance whitelist &7(显示所有维护玩家白名单)"
+helpWhitelistAdd: "&6/maintenance add <name/uuid> &7(将玩家加入维护玩家白名单，这样即使开启了维护，他们也能加入服务器)"
+helpWhitelistRemove: "&6/maintenance remove <name/uuid> &7(将玩家从维护玩家白名单中移除)"
+
+# Bungee/Velocity消息，如果在Spigot/Sponge上使用则可忽略以下内容
+helpAbortSingleTimer: "&6/maintenance aborttimer [server] &7(中止指定服务器开启的计时器)"
+helpSingleEndtimer: "&6/maintenance endtimer [server] <minutes> &7(在以分钟为单位给定时间后将关闭指定服务器的维护模式)"
+helpSingleStarttimer: "&6/maintenance starttimer [server] <minutes> &7(在以分钟为单位给定时间后将开启指定服务器的维护模式)"
+helpSingleToggle: "&6/maintenance <on/off> [server] &7(开启/关闭指定服务器的维护模式)"
+helpStatus: "&6/maintenance status &7(列出当前正在维护的所有服务器)"
@@ -0,0 +1,124 @@
+package eu.kennytv.maintenance.core.config;
+
+import com.google.common.io.Files;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import java.io.File;
+import java.io.IOException;
+
+// I'm sorry in advance
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class ConfigTest {
+
+    @BeforeAll
+    void initAll() {
+        delete("config.yml");
+        delete("config-saved.yml");
+        delete("dirty-config-saved.yml");
+        delete("dirty-config-upgraded.yml");
+        copyOriginalToTest("config.yml", "config.yml");
+    }
+
+    @Test
+    void testDeep() throws IOException {
+        final Config config = new Config(getTestFile("config.yml"));
+        config.load();
+        assert config.getInt("mysql.port") == 3306;
+    }
+
+    @Test
+    void testSaveConsistency() throws IOException {
+        final Config config = new Config(getTestFile("config.yml"));
+        config.load();
+
+        final File saveTo = getTestFile("config-saved.yml");
+        config.saveTo(saveTo);
+
+        final Config newlyLoaded = new Config(saveTo);
+        newlyLoaded.load();
+
+        assert newlyLoaded.toString().equals(config.toString());
+    }
+
+    @Test
+    void testParsing() throws IOException {
+        final Config config = new Config(getTestFile("dirty-config.yml"));
+        config.load();
+        final File saveTo = getTestFile("dirty-config-saved.yml");
+        config.saveTo(saveTo);
+    }
+
+    @Test
+    void testUpgrading() throws IOException {
+        final Config config = new Config(getTestFile("dirty-config.yml"));
+        config.load();
+
+        final Config newestConfig = new Config(getTestFile("config.yml"));
+        newestConfig.load();
+
+        config.addMissingFields(newestConfig.getValues(), newestConfig.getComments());
+        config.set("config-version", 4);
+        final File saveTo = getTestFile("dirty-config-upgraded.yml");
+        config.resetAwesomeHeader();
+        config.saveTo(saveTo);
+
+        final Config newlyLoaded = new Config(saveTo);
+        newlyLoaded.load();
+
+        assert newlyLoaded.contains("waiting-server");
+        assert newlyLoaded.getComments().get("maintenance-enabled") != null;
+        assert newlyLoaded.getComments().get("mysql.use-ssl") != null;
+        assert newlyLoaded.getComments().get("update-checks") != null;
+        assert newlyLoaded.getHeader().equals(newestConfig.getHeader());
+        assert newlyLoaded.getSection("mysql").getString("username").equals("useer");
+        assert newlyLoaded.getInt("config-version") == 4;
+    }
+
+    @Test
+    void testSetAndContains() throws IOException {
+        final Config config = new Config(getTestFile("config.yml"));
+        config.load();
+
+        // Test for pre-existing values
+        assert config.contains("fallback");
+        assert config.contains("mysql.password");
+        assert !config.contains("test");
+        assert config.getComments().containsKey("fallback");
+        assert config.getComments().containsKey("mysql.use-ssl");
+
+        config.set("test", "abc");
+        config.remove("fallback");
+        final ConfigSection section = config.getSection("mysql");
+        section.set("port", 1000);
+        section.remove("use-ssl");
+
+        assert config.contains("test") && config.getString("test").equals("abc");
+        assert config.getInt("mysql.port") == 1000;
+        assert !config.contains("mysql.use-ssl") && !config.getSection("mysql").contains("use-ssl");
+        assert !config.contains("fallback");
+        assert !config.getComments().containsKey("fallback");
+        assert !config.getComments().containsKey("mysql.use-ssl");
+    }
+
+    private File getTestFile(final String path) {
+        return new File("src/test/resources/" + path);
+    }
+
+    private void copyOriginalToTest(final String from, final String to) {
+        final File file = new File("src/main/resources/" + from);
+        try {
+            Files.copy(file, getTestFile(to));
+        } catch (final IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void delete(final String path) {
+        final File file = getTestFile(path);
+        if (file.exists()) {
+            file.delete();
+        }
+    }
+}
@@ -0,0 +1,61 @@
+# Enables maintenance mode.
+maintenance-enabled: true
+
+# Enables maintenance on certain servers managed by your Bungee instance(s).
+proxied-maintenance-servers:
+  - SpigotServer1
+    # - AnotherServer
+
+# If maintenance is enabled on a proxied server with players on it,
+# they will be sent to the fallback server instead of being kicked off the network.
+# If the fallback server is not reachable/not set, they will just be kicked off the network.
+fallback: ''
+
+# 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).
+pingmessages:
+  - |2-
+           &2&lX's &b&lServer &f- &7&l(1.12.2-1.15.2)
+                     &4&n&lMANUTENZIONE!
+enable-timerspecific-messages: true
+timerspecific-pingmessages:
+  - |2-
+           &2&lX's &b&lServer &f- &7&l(1.12.2-1.15.2)
+      &4&n&lMANUTENZIONE! Torneremo tra %TIMER%
+enable-playercountmessage: true
+playercountmessage: '&41.12.2-1.15.2'
+playercounthovermessage: '&n&lStato server: In manutenzione'
+custom-maintenance-icon: false
+send-join-notification: false
+kick-online-players: true
+language: de
+mysql:
+  use-mysql: false
+  host: host
+  port: 3306
+  database: database
+  username: useer
+  password: password
+  update-interval: 15
+  use-ssl: true
+continue-endtimer-after-restart:
+  enabled: false
+  end: 0
+timer-broadcast-for-seconds:
+  - 1200
+  - 900
+  - 600
+  - 300
+  - 120
+  - 60
+  - 30
+  - 20
+  - 10
+  - 5
+  - 4
+  - 3
+  - 2
+  - 1
+update-checks: true
+config-version: 3
@@ -6,7 +6,7 @@
    <parent>
        <groupId>eu.kennytv.maintenance</groupId>
        <artifactId>maintenance-parent</artifactId>
-        <version>3.0.3</version>
+        <version>3.0.5</version>
    </parent>

    <artifactId>maintenance-spigot</artifactId>
@@ -22,7 +22,7 @@
        <dependency>
            <groupId>com.destroystokyo.paper</groupId>
            <artifactId>paper-api</artifactId>
-            <version>1.14.4-R0.1-SNAPSHOT</version>
+            <version>1.15.2-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
        <!-- Needed for backwards compatibility with Paper -->
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -47,6 +47,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.util.CachedServerIcon;
+import org.jetbrains.annotations.Nullable;

 import javax.imageio.ImageIO;
 import java.io.File;
@@ -69,26 +70,24 @@ 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();

        final MaintenanceSpigotCommand command = new MaintenanceSpigotCommand(this, settings);
        commandManager = command;
-        plugin.getCommand("maintenancespigot").setExecutor(command);
+        plugin.getCommand("maintenance").setExecutor(command);

        final PluginManager pm = getServer().getPluginManager();
        pm.registerEvents(new PlayerLoginListener(this, settings), plugin);

        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();
@@ -150,12 +149,14 @@ public final class MaintenanceSpigotPlugin extends MaintenancePlugin {
    }

    @Override
+    @Nullable
    public SenderInfo getOfflinePlayer(final String name) {
        final OfflinePlayer player = getServer().getOfflinePlayer(name);
        return player.getName() != null ? new BukkitOfflinePlayerInfo(player) : null;
    }

    @Override
+    @Nullable
    public SenderInfo getOfflinePlayer(final UUID uuid) {
        final OfflinePlayer player = getServer().getOfflinePlayer(uuid);
        return player.getName() != null ? new BukkitOfflinePlayerInfo(player) : null;
@@ -164,7 +165,7 @@ public final class MaintenanceSpigotPlugin extends MaintenancePlugin {
    @Override
    protected void kickPlayers() {
        for (final Player p : getServer().getOnlinePlayers()) {
-            if (!hasPermission(p, "bypass") && !settings.getWhitelistedPlayers().containsKey(p.getUniqueId())) {
+            if (!hasPermission(p, "bypass") && !settings.isWhitelisted(p.getUniqueId())) {
                p.kickPlayer(settings.getKickMessage());
            }
        }
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -56,11 +56,13 @@ public final class PaperServerListPingListener implements Listener {

        final List<PlayerProfile> sample = event.getPlayerSample();
        sample.clear();
-        for (final String string : settings.getPlayerCountHoverMessage().split("%NEWLINE%"))
+        for (final String string : settings.getPlayerCountHoverMessage().split("\n")) {
            sample.add(new DummyProfile(string));
+        }

-        if (settings.hasCustomIcon() && plugin.getFavicon() != null)
+        if (settings.hasCustomIcon() && plugin.getFavicon() != null) {
            event.setServerIcon(plugin.getFavicon());
+        }
    }

    // Less unnecessary object creation :>
@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -38,9 +38,12 @@ 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());
+            }
        }
    }

@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -64,8 +64,9 @@ public final class ServerInfoPacketListener extends PacketAdapter implements Lis
        }

        final List<WrappedGameProfile> players = new ArrayList<>();
-        for (final String string : settings.getPlayerCountHoverMessage().split("%NEWLINE%"))
+        for (final String string : settings.getPlayerCountHoverMessage().split("\n")) {
            players.add(new WrappedGameProfile(uuid, string));
+        }
        ping.setPlayers(players);
    }

@@ -1,6 +1,6 @@
 /*
 * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * Copyright (C) 2018-2020 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
@@ -38,7 +38,10 @@ public final class ServerListPingListener implements Listener {
    public void serverListPing(final ServerListPingEvent event) {
        if (!settings.isMaintenance()) return;

-        event.setMaxPlayers(0);
+        if (settings.hasCustomPlayerCountMessage()) {
+            event.setMaxPlayers(0);
+        }
+
        event.setMotd(settings.getRandomPingMessage());

        if (settings.hasCustomIcon() && plugin.getFavicon() != null) {
@@ -29,6 +29,7 @@ import java.util.zip.GZIPOutputStream;
 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 final boolean enabled;
    private static boolean logFailedRequests;
@@ -109,10 +110,12 @@ public final class MetricsLite {
    public JsonObject getPluginData() {
        final JsonObject data = new JsonObject();

-        final String pluginName = plugin.getDescription().getName();
+        //final String pluginName = plugin.getDescription().getName();
+        final String pluginName = "MaintenanceSpigot"; // I cut off the suffix, not sure how bStats would like the name change
        final String pluginVersion = plugin.getDescription().getVersion();

        data.addProperty("pluginName", pluginName);
+        data.addProperty("id", PLUGIN_ID);
        data.addProperty("pluginVersion", pluginVersion);
        data.add("customCharts", new JsonArray());

@@ -221,21 +224,18 @@ 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);
        } else {
            connection.getInputStream().close();
@@ -247,9 +247,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();
    }
 }
Author	SHA1	Message	Date
Nassim	9546cc7b74	3.0.5 Release	2020-06-17 10:48:13 +02:00
KennyTV	740051dda5	Prepare for 3.0.5 release	2020-06-17 10:47:20 +02:00
KennyTV	e53f4f2518	Config test additions	2020-06-17 09:31:49 +02:00
KennyTV	03390d7be9	Config set cleanup	2020-06-16 17:49:45 +02:00
KennyTV	039c5a3d04	Use precondition in api getter util	2020-06-16 16:39:23 +02:00
KennyTV	4360eb03e3	Wrong nullable annotation	2020-06-16 16:20:18 +02:00
KennyTV	89691e8064	Minor code cleanup to version checking	2020-06-16 16:19:20 +02:00
KennyTV	8f4860ad56	Update changelog, bump Guava provided version Not that it matters, but want to get rid of the security alert	2020-06-16 09:51:25 +02:00
KennyTV	b8b231ce78	Remove config updating from 2.x See https://github.com/KennyTV/Maintenance/wiki/Updates#updating-from-2x on how to do that manually - virtually noone should be using such old versions anymore	2020-06-10 12:51:25 +02:00
KennyTV	fd8b47a9f5	Automatically move files to new dir on updating	2020-06-09 19:25:21 +02:00
KennyTV	10c0b5bab3	Update README	2020-06-01 13:21:21 +02:00
KennyTV	cece2b5813	Use higher proxy ping listener priority	2020-05-18 22:12:22 +02:00
KennyTV	aa9a686b8a	Replace newline variable in language file Note on why this even exists: Yaml will force save all strings containing line breaks in this rather chunky format: key: \|- First line text Second line text. ... This also happens to string lists, making those practically unreadable, as well as confusing for most users in general. Because of this, I replace %NEWLINE% manually, to spare users from these ugly breaks.	2020-05-15 13:38:41 +02:00
KennyTV	f29b38989c	Add option to set multiple fallback servers	2020-05-12 20:52:47 +02:00
KennyTV	ad9c989213	Add secret language option for server specific kick messages Closes #38	2020-05-12 20:27:59 +02:00
KennyTV	f01e96a32a	Implement deep get in config	2020-05-12 19:32:42 +02:00
KennyTV	e247f4ef10	Remove platform suffix from plugin identifier	2020-04-22 10:59:27 +02:00
KennyTV	b8e0f84d54	Don't hide playercount if custom playercount is disabled	2020-04-21 12:00:23 +02:00
KennyTV	424617c602	Respect custom playercount setting in Spigot ping	2020-04-21 08:36:28 +02:00
KennyTV	21ed266d3d	Fix use-ssl option inversion	2020-04-13 09:29:22 +02:00
KennyTV	a409ec5d66	Update copyright headers	2020-04-10 23:42:06 +02:00
KennyTV	66cba12fd3	Update Russian language file	2020-04-09 08:59:11 +02:00
KennyTV	f6d178d8d1	Add placeholder link to readme	2020-04-06 22:34:04 +02:00
KennyTV	d04749c835	Add Italian language file	2020-04-03 12:27:00 +02:00
KennyTV	eebbc4d532	Fix config loading with multiline strings, add small tests Fixes #37	2020-03-30 12:48:48 +02:00
KennyTV	335fe303b5	Throw around some nullable annotations	2020-03-30 11:02:35 +02:00
KennyTV	1c4b5e62a4	Add Chinese language file	2020-03-17 15:02:47 +01:00
KennyTV	d41fa5ab24	Version increase to 3.0.5-SNAPSHOT	2020-03-17 11:57:12 +01:00
Nassim	7fd486ef40	3.0.4 Release	2020-03-17 11:01:41 +01:00
KennyTV	d0b10f2524	Prepare for 3.0.4 release	2020-03-17 11:00:55 +01:00
KennyTV	865df5e20a	Rearrange new language entries	2020-03-16 15:49:09 +01:00
KennyTV	469e8eb57b	Fix join notifications with waiting servers enabled	2020-03-16 15:48:27 +01:00
KennyTV	368ac37099	Add waiting-server option for global proxy maintenance Includes some other, minor fixes Some proxy modules cleanup	2020-03-16 15:17:09 +01:00
KennyTV	0db4d77c10	Update missing pt messages (by JoaoPinto)	2020-03-16 11:16:46 +01:00
Max Kade	ca4c711103	Fix single server timer accepting number as seconds and not minutes (#35 )	2020-03-11 14:35:56 +01:00
KennyTV	f4a5f288ca	Fix singleserver timers broadcasting globally	2020-02-14 21:40:08 +01:00
KennyTV	0a37bfdefe	Update bStats metrics	2020-02-12 17:20:37 +01:00
KennyTV	3a30dba011	Add option to disable sql ssl	2020-02-09 12:47:28 +01:00
KennyTV	111a229d48	Minor beauty changes	2020-01-29 15:11:01 +01:00
KennyTV	7e948fbe52	Forgot the return	2019-11-21 09:46:51 +01:00
KennyTV	355aa20244	Add Russian language file (thanks to En_0t_S)	2019-11-21 09:44:23 +01:00
KennyTV	6bc54d1812	Don't throw errors when failing the language update check because of custom langs	2019-11-21 09:41:42 +01:00
KennyTV	0042ce3ccd	Version increase to 3.0.4-SNAPSHOT	2019-11-21 09:27:32 +01:00
KennyTV	beb0e52371	Forgot to update the date in the changelog	2019-09-17 09:05:53 +02:00
Nassim	4774ec2f2a	3.0.3 Release	2019-09-17 09:02:27 +02:00