MiniDay/hamster-little-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(hamster-ball-bridge): 修复频道订阅未忽略前缀的问题

Browse Source
This commit is contained in:
叁只仓鼠
2024-03-02 17:36:07 +08:00
parent 3585c82233
commit 048fe1ed61
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hamster-ball-bridge/build.gradle
View File

@@ -1,4 +1,4 @@
version = '1.4.3' version = '1.4.4'
setArchivesBaseName("HamsterBall-Bridge") setArchivesBaseName("HamsterBall-Bridge")
dependencies { dependencies {

2
hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java
View File

@@ -35,6 +35,6 @@ public class BallBridgePlugin extends JavaPlugin {
getLogger().warning("未找到 PlaceholderAPI 插件, 取消注册占位符."); getLogger().warning("未找到 PlaceholderAPI 插件, 取消注册占位符.");
} }
}); });
BallAPI.getInstance().subscribe("HamsterService"); BallAPI.getInstance().subscribeIgnorePrefix("HamsterService");
} }
} }

2
hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceInfoAPI.java
View File

@@ -32,7 +32,7 @@ public class ServiceInfoAPI {
* @return 玩家信息 * @return 玩家信息
*/ */
public static ServicePlayerInfo getPlayerInfo(@NotNull String playerName) { public static ServicePlayerInfo getPlayerInfo(@NotNull String playerName) {
return transfer(BallAPI.getInstance().getPlayerInfo(playerName)); return transfer(BallAPI.getInstance().getPlayerInfoExact(playerName));
} }
/** /**

6
hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/command/ServiceCommand.java
View File

@@ -13,7 +13,6 @@ public class ServiceCommand extends ParentCommand {
public static final ServiceCommand INSTANCE = new ServiceCommand(); public static final ServiceCommand INSTANCE = new ServiceCommand();
private ServiceCommand() { private ServiceCommand() {
super("hamster-service");
addChildCommand(PlayerInfoCommand.INSTANCE); addChildCommand(PlayerInfoCommand.INSTANCE);
addChildCommand(ServerInfoCommand.INSTANCE); addChildCommand(ServerInfoCommand.INSTANCE);
addChildCommand(SudoConsoleCommand.INSTANCE); addChildCommand(SudoConsoleCommand.INSTANCE);
@@ -24,6 +23,11 @@ public class ServiceCommand extends ParentCommand {
return BallBridgePlugin.getInstance(); return BallBridgePlugin.getInstance();
} }
@Override
public @NotNull String getName() {
return "hamster-service";
}
@Override @Override
public boolean hasPermission(@NotNull CommandSender sender) { public boolean hasPermission(@NotNull CommandSender sender) {
return sender.hasPermission("hamster.service.admin"); return sender.hasPermission("hamster.service.admin");

2
hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java
View File

@@ -22,6 +22,6 @@ public class BallBridgePlugin extends Plugin {
BallAPI.getInstance().getEventBus().register(BridgeListener.INSTANCE); BallAPI.getInstance().getEventBus().register(BridgeListener.INSTANCE);
ProxyServer.getInstance().getPluginManager().registerListener(this, ServiceMainListener.INSTANCE); ProxyServer.getInstance().getPluginManager().registerListener(this, ServiceMainListener.INSTANCE);
ProxyServer.getInstance().getPluginManager().registerCommand(this, ServiceCommand.INSTANCE); ProxyServer.getInstance().getPluginManager().registerCommand(this, ServiceCommand.INSTANCE);
BallAPI.getInstance().subscribe("HamsterService"); BallAPI.getInstance().subscribeIgnorePrefix("HamsterService");
} }
} }

9
hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/command/ServiceCommand.java
View File

@@ -8,11 +8,10 @@ public class ServiceCommand extends Command {
public static final ServiceCommand INSTANCE = new ServiceCommand(); public static final ServiceCommand INSTANCE = new ServiceCommand();
private ServiceCommand() { private ServiceCommand() {
super("service", "service.admin"); super("serviceb", "service.admin");
} }
@Override @Override
@SuppressWarnings("SpellCheckingInspection")
public void execute(CommandSender sender, String[] args) { public void execute(CommandSender sender, String[] args) {
if (!sender.hasPermission("service.admin")) { if (!sender.hasPermission("service.admin")) {
sender.sendMessage(new TextComponent("§c你没有权限执行这个命令!")); sender.sendMessage(new TextComponent("§c你没有权限执行这个命令!"));
@@ -23,13 +22,13 @@ public class ServiceCommand extends Command {
return; return;
} }
switch (args[0]) { switch (args[0]) {
case "safemode": {
break;
}
case "command": { case "command": {
SudoConsoleCommand.INSTANCE.onCommand(sender, args); SudoConsoleCommand.INSTANCE.onCommand(sender, args);
break; break;
} }
case "": {
break;
}
} }
} }