Merge remote-tracking branch 'hacker_marc/master'

README.md

@@ -24,3 +24,27 @@ You can kill players with many different method, for example with an explosion o
 1. Download **AdvancedKill_Paper_x.xx.jar** and copy it into the *plugins* directory from your server.
 
 2. Restart the server
+
+## Filter
+The AdvancedKill Plugin has a filter for players. If a player is add to the filter, nobody can kill him with akill.
+
+### Add a player
+To add a player, run
+```
+/afilter <player>
+```
+### Remove a player
+To remoce a player, run
+```
+/afilter <player>
+```
+
+### List players
+To list all players in the filter, run
+```
+/afiler
+```
+
+### Turn filter on and off
+To turn the filter on and off, open `config.yml`. You can find the config.yml in `plugins/AdvancedKill`
+Open it and set `filter-player` to `true`or `false`

src/main/java/de/marc/advancedKill/AdvancedKill.java

@@ -5,7 +5,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import de.marc.advancedKill.commands.*;
 
@@ -17,7 +16,11 @@ public final class AdvancedKill extends JavaPlugin {
     @Override
     public void onEnable() {
         // Plugin startup logic
+        saveDefaultConfig();
+
         getCommand("akill").setExecutor(this);
+        getCommand("afilter").setExecutor(new AdvancedKillFilter(this));
+
         getLogger().info("AdvancedKill was loaded!");
     }
 
@@ -46,7 +49,7 @@ public final class AdvancedKill extends JavaPlugin {
         }
 
 
-        //Define mode et player
+        //Define mode and player
         String mode = args[0].toLowerCase();
         Player target = Bukkit.getPlayer(args[1]);
 
@@ -55,6 +58,19 @@ public final class AdvancedKill extends JavaPlugin {
             return true;
         }
 
+        //Check filter
+        if (getConfig().getBoolean("filter-player")) {
+            List<String> filter = getConfig().getStringList("bypass-players");
+
+            String uuid = target.getUniqueId().toString();
+
+            if (filter.contains(uuid)) {
+                sender.sendMessage("§cYou can not kill this player!");
+                return true;
+            }
+        }
+
+
 
         //Run Commands
         switch (mode) {
@@ -99,21 +115,32 @@ public final class AdvancedKill extends JavaPlugin {
 
     //Completions
     @Override
-    public @Nullable List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+    public @Nullable List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
         List<String> completions = new ArrayList<>();
-        if (sender.hasPermission("akill.use")) {
-            if (args.length == 1) {
-                completions.add("lightning");
-                completions.add("void");
-                completions.add("zombie");
-                completions.add("half");
-                completions.add("anvil");
-                completions.add("explosion");
-                completions.add("fall");
-                completions.add("lava");
-            }
 
-            if (args.length == 2) {
+        if (label.equals("akill")) {
+            if (sender.hasPermission("akill.use")) {
+                if (args.length == 1) {
+                    completions.add("lightning");
+                    completions.add("void");
+                    completions.add("zombie");
+                    completions.add("half");
+                    completions.add("anvil");
+                    completions.add("explosion");
+                    completions.add("fall");
+                    completions.add("lava");
+                }
+
+                if (args.length == 2) {
+                    for (Player player : Bukkit.getOnlinePlayers()) {
+                        completions.add(player.getName());
+                    }
+                }
+            }
+        }
+
+        if (label.equals("afilter")) {
+            if (args.length == 1) {
                 for (Player player : Bukkit.getOnlinePlayers()) {
                     completions.add(player.getName());
                 }

src/main/java/de/marc/advancedKill/AdvancedKillFilter.java

@@ -0,0 +1,62 @@
+package de.marc.advancedKill;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.List;
+
+public class AdvancedKillFilter implements CommandExecutor {
+    private AdvancedKill plugin;
+
+    public AdvancedKillFilter(AdvancedKill plugin) {
+        this.plugin = plugin;
+    }
+
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!sender.hasPermission("akill.admin")) {
+            sender.sendMessage("§cPermission denied!");
+            return true;
+        }
+
+        if (!(plugin.getConfig().getBoolean("filter-player"))) {
+            sender.sendMessage("§cThe filter is not aktive.");
+            return true;
+        }
+
+        List<String> players = plugin.getConfig().getStringList("bypass-players");
+
+        if (!(args.length == 1)) {
+            sender.sendMessage("No Player defined");
+            return true;
+        }
+
+        String msg = "";
+
+        Player target = Bukkit.getPlayer(args[0]);
+
+        if (target == null) {
+            sender.sendMessage("§cPlayer not found!");
+            return true;
+        }
+
+        String uuid = target.getUniqueId().toString();
+
+        if (players.contains(uuid)) {
+            players.remove(uuid);
+            msg = "§aPlayer was removed successfully!";
+        }else{
+            players.add(uuid);
+            msg = "§aPlayer was added successfully!";
+        }
+
+        plugin.getConfig().set("bypass-players", players);
+        plugin.saveConfig();
+
+        sender.sendMessage(msg);
+
+        return true;
+    }
+}

src/main/resources/config.yml

@@ -0,0 +1,8 @@
+# Active Filter Function
+
+filter-player: true
+
+# To filter player, run /afilter <player> to filter players
+
+# Filter List
+bypass-players: []

src/main/resources/plugin.yml

@@ -5,13 +5,17 @@ api-version: '1.21'
 
 commands:
   akill:
-    description: aKill Befehl
+    description: aKill Command
     usage: /akill <mode> <player>
 
+  afilter:
+    description: Filter Players
+    usage: /afilter <player>
+
 permissions:
   akill.use:
-    description: Darf /akill benutzen
+    description: Can use /akill
     default: op
   akill.admin:
-    description: Darf 470Hacker töten
+    description: Can use /afilter
     default: op