From a938f4287e54970b1bad5cac56612e5f658f1e8b Mon Sep 17 00:00:00 2001 From: xSehrMotiviert Date: Wed, 27 Apr 2022 20:52:59 +0200 Subject: [PATCH] Updated Kickall Command. (Removed comments) Updated version number to 1.1.1 --- pom.xml | 2 +- .../nick/velocityplus/VelocityPlus.java | 28 +++++++++++-------- .../velocityplus/command/KickallCommand.java | 28 ++++++++----------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 2bf7f65..b33cf68 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ eu.prellberg.nick velocityplus - 1.1.0 + 1.1.1 17 diff --git a/src/main/java/eu/prellberg/nick/velocityplus/VelocityPlus.java b/src/main/java/eu/prellberg/nick/velocityplus/VelocityPlus.java index 2941fd5..2c6259a 100644 --- a/src/main/java/eu/prellberg/nick/velocityplus/VelocityPlus.java +++ b/src/main/java/eu/prellberg/nick/velocityplus/VelocityPlus.java @@ -15,7 +15,7 @@ import java.nio.file.Path; import java.nio.file.StandardOpenOption; -@Plugin(id = "velocityplus", name = "VelocityPlus", version = "1.1.0", authors = {"Nick Prellberg"}, url = "https://github.com/xsehrmotiviert/velocityplus") +@Plugin(id = "velocityplus", name = "VelocityPlus", version = "1.1.1", authors = {"Nick Prellberg"}, url = "https://github.com/xsehrmotiviert/velocityplus") public class VelocityPlus { private final ProxyServer server; @@ -47,17 +47,21 @@ public void onProxyInitialize(ProxyInitializeEvent event) { } - logger.info("\n\n /$$ /$$ /$$ /$$ /$$ \n" + - "| $$ | $$ | $$ |__/ | $$ /$$ \n" + - "| $$ | $$ /$$$$$$ | $$ /$$$$$$ /$$$$$$$ /$$ /$$$$$$ /$$ /$$ | $$ \n" + - "| $$ / $$//$$__ $$| $$ /$$__ $$ /$$_____/| $$|_ $$_/ | $$ | $$ /$$$$$$$$\n" + - " \\ $$ $$/| $$$$$$$$| $$| $$ \\ $$| $$ | $$ | $$ | $$ | $$|__ $$__/\n" + - " \\ $$$/ | $$_____/| $$| $$ | $$| $$ | $$ | $$ /$$| $$ | $$ | $$ \n" + - " \\ $/ | $$$$$$$| $$| $$$$$$/| $$$$$$$| $$ | $$$$/| $$$$$$$ |__/ \n" + - " \\_/ \\_______/|__/ \\______/ \\_______/|__/ \\___/ \\____ $$ \n" + - " /$$ | $$ \n" + - " | $$$$$$/ \n" + - " \\______/ \nVersion: 1.1.0"); + logger.info(""" + + + /$$ /$$ /$$ /$$ /$$ \s + | $$ | $$ | $$ |__/ | $$ /$$ \s + | $$ | $$ /$$$$$$ | $$ /$$$$$$ /$$$$$$$ /$$ /$$$$$$ /$$ /$$ | $$ \s + | $$ / $$//$$__ $$| $$ /$$__ $$ /$$_____/| $$|_ $$_/ | $$ | $$ /$$$$$$$$ + \\ $$ $$/| $$$$$$$$| $$| $$ \\ $$| $$ | $$ | $$ | $$ | $$|__ $$__/ + \\ $$$/ | $$_____/| $$| $$ | $$| $$ | $$ | $$ /$$| $$ | $$ | $$ \s + \\ $/ | $$$$$$$| $$| $$$$$$/| $$$$$$$| $$ | $$$$/| $$$$$$$ |__/ \s + \\_/ \\_______/|__/ \\______/ \\_______/|__/ \\___/ \\____ $$ \s + /$$ | $$ \s + | $$$$$$/ \s + \\______/ \s + Version: 1.1.1"""); new SendCommand(server, this, logger); new KickallCommand(server, this, logger); diff --git a/src/main/java/eu/prellberg/nick/velocityplus/command/KickallCommand.java b/src/main/java/eu/prellberg/nick/velocityplus/command/KickallCommand.java index fa049c1..d226d78 100644 --- a/src/main/java/eu/prellberg/nick/velocityplus/command/KickallCommand.java +++ b/src/main/java/eu/prellberg/nick/velocityplus/command/KickallCommand.java @@ -19,12 +19,10 @@ public class KickallCommand implements SimpleCommand { private final ProxyServer proxyServer; private final VelocityPlus velocityPlus; - private final Logger logger; public KickallCommand(ProxyServer proxyServer, VelocityPlus velocityPlus, Logger logger) { this.proxyServer = proxyServer; this.velocityPlus = velocityPlus; - this.logger = logger; CommandManager manager = proxyServer.getCommandManager(); manager.register(manager.metaBuilder("kickall").build(), this); } @@ -33,10 +31,7 @@ public KickallCommand(ProxyServer proxyServer, VelocityPlus velocityPlus, Logger public void execute(Invocation invocation) { CommandSource source = invocation.source(); -// if(source instanceof ConsoleCommandSource) {return;} - if (invocation.arguments().length < 1 || Objects.equals(invocation.arguments()[0], "--force")) { - // Check permissions for kickall with no arguments if (!source.hasPermission("vplus.kickall.all")) { source.sendMessage(Component.text(String.join(" ", velocityPlus.getConfig().getString("general.prefix"), velocityPlus.getConfig().getString("general.missingPermissions")))); return; @@ -47,20 +42,20 @@ public void execute(Invocation invocation) { } proxyServer.getAllPlayers() .forEach(player -> { - // Return, wenn Sender = Spieler if (source == player) return; - // Return, wenn Spieler hat bypass, sender hat keine Force Permission und Argument ist nicht vorhanden + if (player.hasPermission("vplus.kickall.bypass") && !source.hasPermission("vplus.kickall.force") && invocation.arguments().length == 0) return; - // Return, wenn Spieler hat bypass, sender hat Force Permission, Argument ist aber nicht vorhanden + if (player.hasPermission("vplus.kickall.bypass") && source.hasPermission("vplus.kickall.force") && invocation.arguments().length == 0) return; - // Return, wenn Spieler hat bypass, sender hat Force Permission, Argument 0 ist aber nicht --force + if (player.hasPermission("vplus.kickall.bypass") && source.hasPermission("vplus.kickall.force") && !Objects.equals(invocation.arguments()[0], "--force")) return; - // Return, wenn Spieler hat bypass, sender, hat keine Force Permission und Argument ist --force + if (player.hasPermission("vplus.kickall.bypass") && !source.hasPermission("vplus.kickall.force") && Objects.equals(invocation.arguments()[0], "--force")) return; + player.disconnect( Component.text(String.join(" ", velocityPlus.getConfig().getString("general.prefix"), velocityPlus.getConfig().getString("kickall.command.kicked"))) ); @@ -70,7 +65,7 @@ public void execute(Invocation invocation) { } Optional server = proxyServer.getServer(invocation.arguments()[0].toLowerCase(Locale.ROOT)); - // Check for Permissions for single Server (Should work) + if (!source.hasPermission("vplus.kickall." + invocation.arguments()[0].toLowerCase(Locale.ROOT))) { if (!source.hasPermission("vplus.kickall.all")) { source.sendMessage(Component.text(String.join(" ", velocityPlus.getConfig().getString("general.prefix"), velocityPlus.getConfig().getString("general.missingPermissions")))); @@ -89,20 +84,21 @@ public void execute(Invocation invocation) { server.get().getPlayersConnected() .forEach(player -> { - // Return, wenn Sender = Spieler + if (source == player) return; - // Return, wenn Spieler hat bypass, sender hat keine Force Permission und Argument ist nicht vorhanden + if (player.hasPermission("vplus.kickall.bypass") && !source.hasPermission("vplus.kickall.force") && invocation.arguments().length == 1) return; - // Return, wenn Spieler hat bypass, sender hat Force Permission, Argument ist aber nicht vorhanden + if (player.hasPermission("vplus.kickall.bypass") && source.hasPermission("vplus.kickall.force") && invocation.arguments().length == 1) return; - // Return, wenn Spieler hat bypass, sender hat Force Permission, Argument 0 ist aber nicht --force + if (player.hasPermission("vplus.kickall.bypass") && source.hasPermission("vplus.kickall.force") && invocation.arguments().length >= 2 && !Objects.equals(invocation.arguments()[1], "--force")) return; - // Return, wenn Spieler hat bypass, sender, hat keine Force Permission und Argument ist --force + if (player.hasPermission("vplus.kickall.bypass") && !source.hasPermission("vplus.kickall.force") && invocation.arguments().length >= 2 && Objects.equals(invocation.arguments()[1], "--force")) return; + player.disconnect( Component.text(String.join(" ", velocityPlus.getConfig().getString("general.prefix"), velocityPlus.getConfig().getString("kickall.command.kicked"))) );