Merge remote-tracking branch 'hacker_marc/master'

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

@@ -19,10 +19,7 @@ public final class AdvancedKill extends JavaPlugin {
         saveDefaultConfig();
 
         getCommand("akill").setExecutor(this);
-
-        if (getConfig().getBoolean("filter-player")) {
         getCommand("afilter").setExecutor(new AdvancedKillFilter(this));
-        }
 
         getLogger().info("AdvancedKill was loaded!");
     }
@@ -62,6 +59,7 @@ public final class AdvancedKill extends JavaPlugin {
         }
 
         //Check filter
+        if (getConfig().getBoolean("filter-player")) {
             List<String> filter = getConfig().getStringList("bypass-players");
 
             String uuid = target.getUniqueId().toString();
@@ -70,6 +68,9 @@ public final class AdvancedKill extends JavaPlugin {
                 sender.sendMessage("§cYou can not kill this player!");
                 return true;
             }
+        }
+
+
 
         //Run Commands
         switch (mode) {

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

@@ -21,6 +21,20 @@ public class AdvancedKillFilter implements CommandExecutor {
             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) {
@@ -30,10 +44,6 @@ public class AdvancedKillFilter implements CommandExecutor {
 
         String uuid = target.getUniqueId().toString();
 
-        List<String> players = plugin.getConfig().getStringList("bypass-players");
-
-        String msg = "";
-
         if (players.contains(uuid)) {
             players.remove(uuid);
             msg = "§aPlayer was removed successfully!";