From 5849f05a69a1b46f5634704b53bf7fcf644fa9ae Mon Sep 17 00:00:00 2001 From: Triassic Date: Mon, 9 Oct 2023 16:08:42 +0300 Subject: [PATCH 1/2] Add ability to require permission to send-on-login --- .../common/configuration/ProxyConfiguration.java | 6 ++++++ .../velocity/listener/data/PluginMessageListener.java | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/ProxyConfiguration.java b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/ProxyConfiguration.java index fed867f..5f01805 100644 --- a/common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/ProxyConfiguration.java +++ b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/ProxyConfiguration.java @@ -80,6 +80,12 @@ public class ProxyConfiguration { return this.sendOnLogin; } + @Comment("Require players to have the authmevelocity.send-on-login permission?") + private boolean requirePermission = false; + public boolean isRequirePermission() { + return this.requirePermission; + } + @Comment(""" List of servers to send One of these servers will be chosen at random""") diff --git a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/data/PluginMessageListener.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/data/PluginMessageListener.java index a9393c4..924f9e7 100644 --- a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/data/PluginMessageListener.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/data/PluginMessageListener.java @@ -134,6 +134,10 @@ public final class PluginMessageListener implements Listener return; } + if (plugin.config().get().sendOnLogin().isRequirePermission() && !player.hasPermission("authmevelocity.send-on-login")) { + return; + } + eventManager.fire(new PreSendOnLoginEvent(player, loginServer, toSend.object())) .thenAccept(event -> { if (!event.getResult().isAllowed()) { From 87df9fc82597b1f10354bfee9e2095668bf84816 Mon Sep 17 00:00:00 2001 From: Triassic Date: Mon, 9 Oct 2023 17:33:40 +0300 Subject: [PATCH 2/2] Update maven repository link --- velocity/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 3c2ff40..3522bb0 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -15,7 +15,7 @@ repositories { includeGroup("net.byteflux") } } - maven("https://maven.elytrium.net/repo/") + maven("https://mvn.exceptionflug.de/repository/exceptionflug-public/") } dependencies {