Compare commits
2 Commits
fd092a02cc
...
beta2.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9814a58ea6 | ||
|
|
6b263e0e8b |
@@ -5,7 +5,6 @@ import org.bukkit.command.Command;
|
|||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
import org.jetbrains.annotations.NotNull;
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import de.marc.advancedKill.commands.*;
|
import de.marc.advancedKill.commands.*;
|
||||||
|
|
||||||
@@ -17,7 +16,14 @@ public final class AdvancedKill extends JavaPlugin {
|
|||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
// Plugin startup logic
|
// Plugin startup logic
|
||||||
|
saveDefaultConfig();
|
||||||
|
|
||||||
getCommand("akill").setExecutor(this);
|
getCommand("akill").setExecutor(this);
|
||||||
|
|
||||||
|
if (getConfig().getBoolean("filter-player")) {
|
||||||
|
getCommand("afilter").setExecutor(new AdvancedKillFilter(this));
|
||||||
|
}
|
||||||
|
|
||||||
getLogger().info("AdvancedKill was loaded!");
|
getLogger().info("AdvancedKill was loaded!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -46,7 +52,7 @@ public final class AdvancedKill extends JavaPlugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//Define mode et player
|
//Define mode and player
|
||||||
String mode = args[0].toLowerCase();
|
String mode = args[0].toLowerCase();
|
||||||
Player target = Bukkit.getPlayer(args[1]);
|
Player target = Bukkit.getPlayer(args[1]);
|
||||||
|
|
||||||
@@ -55,6 +61,15 @@ public final class AdvancedKill extends JavaPlugin {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Check filter
|
||||||
|
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
|
//Run Commands
|
||||||
switch (mode) {
|
switch (mode) {
|
||||||
@@ -99,21 +114,32 @@ public final class AdvancedKill extends JavaPlugin {
|
|||||||
|
|
||||||
//Completions
|
//Completions
|
||||||
@Override
|
@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<>();
|
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()) {
|
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||||
completions.add(player.getName());
|
completions.add(player.getName());
|
||||||
}
|
}
|
||||||
|
|||||||
52
src/main/java/de/marc/advancedKill/AdvancedKillFilter.java
Normal file
52
src/main/java/de/marc/advancedKill/AdvancedKillFilter.java
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
Player target = Bukkit.getPlayer(args[0]);
|
||||||
|
|
||||||
|
if (target == null) {
|
||||||
|
sender.sendMessage("§cPlayer not found!");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
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!";
|
||||||
|
}else{
|
||||||
|
players.add(uuid);
|
||||||
|
msg = "§aPlayer was added successfully!";
|
||||||
|
}
|
||||||
|
|
||||||
|
plugin.getConfig().set("bypass-players", players);
|
||||||
|
plugin.saveConfig();
|
||||||
|
|
||||||
|
sender.sendMessage(msg);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
8
src/main/resources/config.yml
Normal file
8
src/main/resources/config.yml
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
# Active Filter Function
|
||||||
|
|
||||||
|
filter-player: true
|
||||||
|
|
||||||
|
# To filter player, run /afilter <player> to filter players
|
||||||
|
|
||||||
|
# Filter List
|
||||||
|
bypass-players: []
|
||||||
@@ -5,13 +5,17 @@ api-version: '1.21'
|
|||||||
|
|
||||||
commands:
|
commands:
|
||||||
akill:
|
akill:
|
||||||
description: aKill Befehl
|
description: aKill Command
|
||||||
usage: /akill <mode> <player>
|
usage: /akill <mode> <player>
|
||||||
|
|
||||||
|
afilter:
|
||||||
|
description: Filter Players
|
||||||
|
usage: /afilter <player>
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
akill.use:
|
akill.use:
|
||||||
description: Darf /akill benutzen
|
description: Can use /akill
|
||||||
default: op
|
default: op
|
||||||
akill.admin:
|
akill.admin:
|
||||||
description: Darf 470Hacker töten
|
description: Can use /afilter
|
||||||
default: op
|
default: op
|
||||||
Reference in New Issue
Block a user