PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix command identity

Browse Source
This commit is contained in:
Marc Baloup 2024-07-10 16:08:42 +02:00
parent 0c7fb9b370
commit 001239fe57
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pandalib-paper/src/main/java/fr/pandacube/lib/paper/commands/PaperBrigadierCommand.java
View File

@ -77,9 +77,8 @@ public abstract class PaperBrigadierCommand extends BrigadierCommand<CommandSour
*/ */
public static void restoreVanillaCommand(String name) { public static void restoreVanillaCommand(String name) {
PandaLibPaper.getPlugin().getLifecycleManager().registerEventHandler(LifecycleEvents.COMMANDS, event -> { PandaLibPaper.getPlugin().getLifecycleManager().registerEventHandler(LifecycleEvents.COMMANDS,
updateVanillaPaperDispatcher(event.registrar().getDispatcher()); event -> updateVanillaPaperDispatcher(event.registrar().getDispatcher()));
});
Bukkit.getServer().getScheduler().runTask(PandaLibPaper.getPlugin(), () -> { Bukkit.getServer().getScheduler().runTask(PandaLibPaper.getPlugin(), () -> {
@ -222,17 +221,6 @@ public abstract class PaperBrigadierCommand extends BrigadierCommand<CommandSour
.build(); .build();
} }
private static String getCommandIdentity(Command bukkitCmd) {
if (bukkitCmd instanceof PluginCommand cmd) {
return "Bukkit command /" + cmd.getName() + " from plugin " + cmd.getPlugin().getName();
}
else if (VanillaCommandWrapper.REFLECT.get().isInstance(bukkitCmd)) {
return "Vanilla command /" + bukkitCmd.getName();
}
else
return bukkitCmd.getClass().getName() + " /" + bukkitCmd.getName();
}
private static String getCommandIdentity(CommandNode<CommandSourceStack> command) { private static String getCommandIdentity(CommandNode<CommandSourceStack> command) {
if (PluginCommandNode.REFLECT.get().isInstance(command)) { if (PluginCommandNode.REFLECT.get().isInstance(command)) {
PluginCommandNode wrappedPCN = wrap(command, PluginCommandNode.class); PluginCommandNode wrappedPCN = wrap(command, PluginCommandNode.class);
@ -240,7 +228,15 @@ public abstract class PaperBrigadierCommand extends BrigadierCommand<CommandSour
} }
else if (BukkitCommandNode.REFLECT.get().isInstance(command)) { else if (BukkitCommandNode.REFLECT.get().isInstance(command)) {
BukkitCommandNode wrappedBCN = wrap(command, BukkitCommandNode.class); BukkitCommandNode wrappedBCN = wrap(command, BukkitCommandNode.class);
return getCommandIdentity(wrappedBCN.getBukkitCommand()); Command bukkitCmd = wrappedBCN.getBukkitCommand();
if (bukkitCmd instanceof PluginCommand cmd) {
return "Bukkit command /" + command.getName() + " from plugin " + cmd.getPlugin().getName();
}
else if (VanillaCommandWrapper.REFLECT.get().isInstance(bukkitCmd)) {
return "Bukkit wrapped vanilla command /" + command.getName();
}
else
return bukkitCmd.getClass().getName() + " /" + bukkitCmd.getName();
} }
else { else {
return "Vanilla command /" + command.getName(); return "Vanilla command /" + command.getName();