3.0.4 Release

kennytv · Mar 17, 2020 · 7fd486e · 7fd486e
2 parents beb0e52 + d0b10f2
commit 7fd486e
Show file tree

Hide file tree

Showing 46 changed files with 779 additions and 352 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -1,6 +1,18 @@
 # Maintenance Changelog
 This file contains update logs for this project. The top may contain a `Unreleased` section, gathering update logs for a future update during development.
 
+## 3.0.4 - March 17th 2020
+### Changed
+* Bungee/Velocity: Added config option `waiting-server` to send players to a waiting server when global maintenance is enabled (instead of kicking them)
+* Bungee/Velocity: Added config option `use-ssl` in the `mysql` section to disable SSL connections
+* Added Russian language file (thanks to Spigot user En_0t_S)
+* Updated missing translations in Portuguese language file (thanks to Spigot user JoaoPinto)
+* Updated bStats metrics
+### Fixed
+* Fixed singleserver timers using input as seconds instead of minutes (by mxs42)
+* Fixed language updating with an unknown/self-translated language file
+* Fixed Velocity server autocompletion in the maintenance command
+---
 ## 3.0.3 - September 17th 2019
 ### Changed
 * Bungee/Velocity: Added `maintenance.singleserver.bypass.<server>` permission to give individual bypasses for proxied servers (`maintenance.bypass` will still bypass everything as the super-perm)
@@ -15,7 +27,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

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

diff --git a/maintenance-api/pom.xml b/maintenance-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.kennytv.maintenance</groupId>
         <artifactId>maintenance-parent</artifactId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
     </parent>
 
     <artifactId>maintenance-api</artifactId>
@@ -16,13 +16,13 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.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>

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

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

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

diff --git a/maintenance-bungee/src/main/java/eu/kennytv/maintenance/bungee/MaintenanceBungeePlugin.java b/maintenance-bungee/src/main/java/eu/kennytv/maintenance/bungee/MaintenanceBungeePlugin.java
@@ -116,9 +116,9 @@ public boolean isMaintenance(final ServerInfo serverInfo) {
     }
 
     @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());
             }
         }
@@ -127,15 +127,32 @@ protected void kickPlayers() {
     @Override
     protected void kickPlayers(final Server server, final Server fallback) {
         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.getMessage("singleMaintenanceKickComplete").replace("%NEWLINE%", "\n").replace("%SERVER%", server.getName()));
             } else {
-                p.sendMessage(settingsProxy.getMessage("singleMaintenanceActivated").replace("%SERVER%", server.getName()));
+                player.sendMessage(settingsProxy.getMessage("singleMaintenanceActivated").replace("%SERVER%", server.getName()));
+            }
+        }
+    }
+
+    @Override
+    protected void kickPlayersTo(final Server server) {
+        final ServerInfo serverInfo = ((BungeeServer) server).getServer();
+        // Notifications done in global method
+        for (final ProxiedPlayer player : getProxy().getPlayers()) {
+            if (hasPermission(player, "bypass") || settingsProxy.isWhitelisted(player.getUniqueId())) continue;
+            if (player.getServer() != null && player.getServer().getInfo().getName().equals(serverInfo.getName())) continue;
+            if (serverInfo.canAccess(player) && !isMaintenance(serverInfo)) {
+                player.sendMessage(settingsProxy.getMessage("sentToWaitingServer").replace("%SERVER%", server.getName()));
+                player.connect(serverInfo);
+            } else {
+                player.disconnect(settingsProxy.getKickMessage());
             }
         }
     }
@@ -166,7 +183,8 @@ public SenderInfo getOfflinePlayer(final UUID uuid) {
     @Override
     public String getServer(final SenderInfo sender) {
         final ProxiedPlayer player = getProxy().getPlayer(sender.getUuid());
-        return player != null ? player.getServer().getInfo().getName() : "";
+        if (player == null || player.getServer() == null) return null;
+        return player.getServer().getInfo().getName();
     }
 
     @Override

diff --git a/...ce-bungee/src/main/java/eu/kennytv/maintenance/bungee/listener/ServerConnectListener.java b/...ce-bungee/src/main/java/eu/kennytv/maintenance/bungee/listener/ServerConnectListener.java
@@ -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 void serverConnect(final ServerConnectEvent event) {
         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);
             }
         }
     }