From 048fe1ed618cd38eee75fe3c361a5cc2ecbaa6cd Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Sat, 2 Mar 2024 17:36:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(hamster-ball-bridge):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=A2=91=E9=81=93=E8=AE=A2=E9=98=85=E6=9C=AA=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E5=89=8D=E7=BC=80=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hamster-ball-bridge/build.gradle | 2 +- .../cn/hamster3/service/bukkit/BallBridgePlugin.java | 2 +- .../cn/hamster3/service/bukkit/api/ServiceInfoAPI.java | 2 +- .../hamster3/service/bukkit/command/ServiceCommand.java | 6 +++++- .../cn/hamster3/service/bungee/BallBridgePlugin.java | 2 +- .../hamster3/service/bungee/command/ServiceCommand.java | 9 ++++----- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/hamster-ball-bridge/build.gradle b/hamster-ball-bridge/build.gradle index e5b677d..aacb0f3 100644 --- a/hamster-ball-bridge/build.gradle +++ b/hamster-ball-bridge/build.gradle @@ -1,4 +1,4 @@ -version = '1.4.3' +version = '1.4.4' setArchivesBaseName("HamsterBall-Bridge") dependencies { diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java index 344ad18..54524e9 100644 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java @@ -35,6 +35,6 @@ public class BallBridgePlugin extends JavaPlugin { getLogger().warning("未找到 PlaceholderAPI 插件, 取消注册占位符."); } }); - BallAPI.getInstance().subscribe("HamsterService"); + BallAPI.getInstance().subscribeIgnorePrefix("HamsterService"); } } diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceInfoAPI.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceInfoAPI.java index 635713d..222480a 100644 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceInfoAPI.java +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceInfoAPI.java @@ -32,7 +32,7 @@ public class ServiceInfoAPI { * @return 玩家信息 */ public static ServicePlayerInfo getPlayerInfo(@NotNull String playerName) { - return transfer(BallAPI.getInstance().getPlayerInfo(playerName)); + return transfer(BallAPI.getInstance().getPlayerInfoExact(playerName)); } /** diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/ServiceCommand.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/ServiceCommand.java index 630c11e..b0b43d3 100644 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/ServiceCommand.java +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/ServiceCommand.java @@ -13,7 +13,6 @@ public class ServiceCommand extends ParentCommand { public static final ServiceCommand INSTANCE = new ServiceCommand(); private ServiceCommand() { - super("hamster-service"); addChildCommand(PlayerInfoCommand.INSTANCE); addChildCommand(ServerInfoCommand.INSTANCE); addChildCommand(SudoConsoleCommand.INSTANCE); @@ -24,6 +23,11 @@ public class ServiceCommand extends ParentCommand { return BallBridgePlugin.getInstance(); } + @Override + public @NotNull String getName() { + return "hamster-service"; + } + @Override public boolean hasPermission(@NotNull CommandSender sender) { return sender.hasPermission("hamster.service.admin"); diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java index e4d6292..6a28424 100644 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java @@ -22,6 +22,6 @@ public class BallBridgePlugin extends Plugin { BallAPI.getInstance().getEventBus().register(BridgeListener.INSTANCE); ProxyServer.getInstance().getPluginManager().registerListener(this, ServiceMainListener.INSTANCE); ProxyServer.getInstance().getPluginManager().registerCommand(this, ServiceCommand.INSTANCE); - BallAPI.getInstance().subscribe("HamsterService"); + BallAPI.getInstance().subscribeIgnorePrefix("HamsterService"); } } diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/command/ServiceCommand.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/command/ServiceCommand.java index 5b3fe44..8c863eb 100644 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/command/ServiceCommand.java +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/command/ServiceCommand.java @@ -8,11 +8,10 @@ public class ServiceCommand extends Command { public static final ServiceCommand INSTANCE = new ServiceCommand(); private ServiceCommand() { - super("service", "service.admin"); + super("serviceb", "service.admin"); } @Override - @SuppressWarnings("SpellCheckingInspection") public void execute(CommandSender sender, String[] args) { if (!sender.hasPermission("service.admin")) { sender.sendMessage(new TextComponent("§c你没有权限执行这个命令!")); @@ -23,13 +22,13 @@ public class ServiceCommand extends Command { return; } switch (args[0]) { - case "safemode": { - break; - } case "command": { SudoConsoleCommand.INSTANCE.onCommand(sender, args); break; } + case "": { + break; + } } }