zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

Add required sender checking and add more tests

Browse source
This commit is contained in:
Alexander Söderberg 2020-09-16 21:22:46 +02:00
parent f5e230945d
commit bc261676e7
No known key found for this signature in database
GPG key ID: C0207FF7EA146678
7 changed files with 194 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandManager.java
View file

@ -58,8 +58,8 @@ public class BukkitCommandManager<C extends com.intellectualsites.commands.sende
CommandExecutionCoordinator<C, BukkitCommandMeta>> commandExecutionCoordinator,
@Nonnull final Function<CommandSender, C> commandSenderMapper)
throws Exception {
super(commandExecutionCoordinator, new BukkitPluginRegistrationHandler());
((BukkitPluginRegistrationHandler) this.getCommandRegistrationHandler()).initialize(this);
super(commandExecutionCoordinator, new BukkitPluginRegistrationHandler<>());
((BukkitPluginRegistrationHandler<C>) this.getCommandRegistrationHandler()).initialize(this);
this.owningPlugin = owningPlugin;
this.commandSenderMapper = commandSenderMapper;

13
cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitPluginRegistrationHandler.java
View file

@ -25,6 +25,7 @@ package com.intellectualsites.commands;
import com.intellectualsites.commands.components.CommandComponent;
import com.intellectualsites.commands.internal.CommandRegistrationHandler;
import com.intellectualsites.commands.sender.CommandSender;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandMap;
import org.bukkit.command.SimpleCommandMap;
@ -36,18 +37,18 @@ import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
final class BukkitPluginRegistrationHandler implements CommandRegistrationHandler<BukkitCommandMeta> {
final class BukkitPluginRegistrationHandler<C extends CommandSender> implements CommandRegistrationHandler<BukkitCommandMeta> {
private final Map<CommandComponent<?, ?>, org.bukkit.command.Command> registeredCommands = new HashMap<>();
private Map<String, org.bukkit.command.Command> bukkitCommands;
private BukkitCommandManager bukkitCommandManager;
private BukkitCommandManager<C> bukkitCommandManager;
private CommandMap commandMap;
BukkitPluginRegistrationHandler() {
}
void initialize(@Nonnull final BukkitCommandManager bukkitCommandManager) throws Exception {
void initialize(@Nonnull final BukkitCommandManager<C> bukkitCommandManager) throws Exception {
final Method getCommandMap = Bukkit.getServer().getClass().getDeclaredMethod("getCommandMap");
getCommandMap.setAccessible(true);
this.commandMap = (CommandMap) getCommandMap.invoke(Bukkit.getServer());
@ -73,9 +74,9 @@ final class BukkitPluginRegistrationHandler implements CommandRegistrationHandle
} else {
label = commandComponent.getName();
}
@SuppressWarnings("unchecked") final BukkitCommand bukkitCommand = new BukkitCommand(
(Command<BukkitCommandSender, BukkitCommandMeta>) command,
(CommandComponent<BukkitCommandSender, ?>) commandComponent,
@SuppressWarnings("unchecked") final BukkitCommand<C> bukkitCommand = new BukkitCommand<>(
(Command<C, BukkitCommandMeta>) command,
(CommandComponent<C, ?>) commandComponent,
this.bukkitCommandManager);
this.registeredCommands.put(commandComponent, bukkitCommand);
this.commandMap.register(commandComponent.getName(), this.bukkitCommandManager.getOwningPlugin().getName().toLowerCase(),

2
cloud-minecraft/cloud-paper/src/main/java/com/intellectualsites/commands/PaperCommandManager.java
View file

@ -69,7 +69,7 @@ public class PaperCommandManager<C extends com.intellectualsites.commands.sender
Bukkit.getPluginManager().registerEvents(brigadierListener,
this.getOwningPlugin());
return brigadierListener;
} catch (final Exception e) {
} catch (final Throwable e) {
this.getOwningPlugin().getLogger().severe("Failed to register Brigadier listener");
e.printStackTrace();
}