From ce746f5763488c132e5da6d2cc429c0688a5b933 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Fri, 28 Apr 2023 08:02:29 +0800 Subject: [PATCH] =?UTF-8?q?OP=E6=A3=80=E6=9F=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Commands/OpCheckCommandExecutor.java | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/frontleaves/xf_tools/Commands/OpCheckCommandExecutor.java b/src/main/java/org/frontleaves/xf_tools/Commands/OpCheckCommandExecutor.java index 5917bf5..16cff9b 100644 --- a/src/main/java/org/frontleaves/xf_tools/Commands/OpCheckCommandExecutor.java +++ b/src/main/java/org/frontleaves/xf_tools/Commands/OpCheckCommandExecutor.java @@ -4,6 +4,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; +import org.bukkit.entity.Player; import org.frontleaves.xf_tools.XF_Tools; public class OpCheckCommandExecutor implements CommandExecutor { @@ -15,19 +16,28 @@ public class OpCheckCommandExecutor implements CommandExecutor { } @Override - public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) { - if (command.getName().equalsIgnoreCase("op")) { + public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) { + if (command.getName().equalsIgnoreCase("op") || command.getName().equalsIgnoreCase("deop")) { if (strings.length == 0) { - if (commandSender.isOp()) { - commandSender.sendMessage(String.format("%s§r%s §r§c我不建议你赋予管理员！", Tools.XF_Prefix, Tools.XF_PrefixArrow)); + if (sender.isOp()) { + if (sender instanceof ConsoleCommandSender) { + sender.sendMessage(String.format("%s§r%s §r§c此命令被禁止，请使用 §6/xf-op §c查看帮助！", Tools.XF_Prefix, Tools.XF_PrefixArrow)); + } else { + sender.sendMessage(String.format("%s§r%s §r§c我不建议你赋予管理员！", Tools.XF_Prefix, Tools.XF_PrefixArrow)); + } } else { - commandSender.sendMessage(String.format("%s§r%s §r§c你可不是管理员哦！这个指令不要用，别怪我没提醒你！", Tools.XF_Prefix, Tools.XF_PrefixArrow)); + sender.sendMessage(String.format("%s§r%s §r§c你可不是管理员哦！这个指令不要用，别怪我没提醒你！", Tools.XF_Prefix, Tools.XF_PrefixArrow)); } } else { - if (commandSender instanceof ConsoleCommandSender) { - commandSender.sendMessage(String.format("%s§r%s §r§c此命令被禁止，请使用 §6/xf-op §c查看帮助！", Tools.XF_Prefix, Tools.XF_PrefixArrow)); + if (sender instanceof ConsoleCommandSender) { + sender.sendMessage(String.format("%s§r%s §r§c此命令被禁止，请使用 §6/xf-op §c查看帮助！", Tools.XF_Prefix, Tools.XF_PrefixArrow)); } else { - commandSender.sendMessage(String.format("%s§r%s §r§c禁止游戏内赋予管理员！此命令被禁止", Tools.XF_Prefix, Tools.XF_PrefixArrow)); + Player player = (Player) sender; + sender.sendMessage(String.format("%s§r%s §r§c禁止游戏内赋予管理员！此命令被禁止", Tools.XF_Prefix, Tools.XF_PrefixArrow)); + if (sender.isOp()) + player.kickPlayer(String.format("§7[%s§7] §r§c我跟你说过了，服务器内不允许赋予OP", Tools.XF_Prefix)); + else + player.kickPlayer(String.format("§7[%s§7] §r§c我跟你说过了，服务器内不允许赋予OP，何况你也不是OP", Tools.XF_Prefix)); } } }