From 239a0c5de9829f277df7556e0a8dd3ab8f1ede0c Mon Sep 17 00:00:00 2001 From: jhqwqmc <2110242767@qq.com> Date: Wed, 30 Apr 2025 00:39:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(bukkit):=20=E5=A4=84=E7=90=86op=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E5=AF=BC=E8=87=B4=E7=9A=84=E6=9D=83=E9=99=90=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bukkit/font/BukkitFontManager.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/font/BukkitFontManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/font/BukkitFontManager.java index dcfb73ef1..8d52e9ade 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/font/BukkitFontManager.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/font/BukkitFontManager.java @@ -258,25 +258,22 @@ public class BukkitFontManager extends AbstractFontManager implements Listener { } private void processOpCommand(CommandSender sender, String command) { - if (!sender.hasPermission("minecraft.command.op")) return; - if (!sender.hasPermission("minecraft.command.deop")) return; + if (!sender.hasPermission("minecraft.command.op") || !sender.hasPermission("minecraft.command.deop")) return; String input = command.startsWith("/") ? command.substring(1) : command; int firstSpaceIndex = input.indexOf(' '); String cmdPart = (firstSpaceIndex == -1) ? input : input.substring(0, firstSpaceIndex); String argPart = (firstSpaceIndex == -1) ? "" : input.substring(firstSpaceIndex + 1).trim(); int lastColonIndex = cmdPart.lastIndexOf(':'); if (lastColonIndex != -1 && !cmdPart.substring(0, lastColonIndex).equals("minecraft")) return; - String cmd = lastColonIndex == -1 ? cmdPart : cmdPart.substring(lastColonIndex + 1); - cmd = cmd.toLowerCase(); + String cmd = (lastColonIndex == -1 ? cmdPart : cmdPart.substring(lastColonIndex + 1)).toLowerCase(); if (!cmd.equals("op") && !cmd.equals("deop")) return; + int nextSpaceIndex = argPart.indexOf(' '); + String targetName = (nextSpaceIndex == -1) ? argPart : argPart.substring(0, nextSpaceIndex); + if (targetName.isEmpty()) return; this.plugin.scheduler().asyncLater( () -> { - int nextSpaceIndex = argPart.indexOf(' '); - String targetName = (nextSpaceIndex == -1) ? argPart : argPart.substring(0, nextSpaceIndex); - if (targetName.isEmpty()) return; Player player = Bukkit.getPlayer(targetName); - if (player == null) return; - if (!player.isOnline()) return; + if (player == null || !player.isOnline()) return; removeEmojiSuggestions(player); addEmojiSuggestions(player, getEmojiSuggestion(player)); },