Manager for handling commands. This allows you to easily process commands, * including nested commands, by correctly annotating methods of a class.
@@ -425,6 +420,8 @@ public void execute(String[] args, T player, executeMethod(null, args, player, newMethodArgs, 0); } + public abstract void checkSender(T sender, Method method) throws CommandException; + /** * Attempt to execute a command. * @@ -453,6 +450,7 @@ public void executeMethod(Method parent, String[] args, } checkPermission(player, method); + checkSender(player, method); int argsCount = args.length - 1 - level; diff --git a/core/src/main/java/com/sk89q/minecraft/util/commands/ConsoleCommandException.java b/core/src/main/java/com/sk89q/minecraft/util/commands/ConsoleCommandException.java new file mode 100644 index 0000000..76a7529 --- /dev/null +++ b/core/src/main/java/com/sk89q/minecraft/util/commands/ConsoleCommandException.java @@ -0,0 +1,7 @@ +package com.sk89q.minecraft.util.commands; + +/** + * Raised when the console attempts to execute a command not annotated with {@link Console}. + */ +public class ConsoleCommandException extends CommandException { +} diff --git a/bukkit/src/main/java/com/sk89q/bukkit/pagination/PaginatedResult.java b/core/src/main/java/com/sk89q/minecraft/util/pagination/PaginatedResult.java similarity index 85% rename from bukkit/src/main/java/com/sk89q/bukkit/pagination/PaginatedResult.java rename to core/src/main/java/com/sk89q/minecraft/util/pagination/PaginatedResult.java index 39a6dee..926021c 100644 --- a/bukkit/src/main/java/com/sk89q/bukkit/pagination/PaginatedResult.java +++ b/core/src/main/java/com/sk89q/minecraft/util/pagination/PaginatedResult.java @@ -16,15 +16,14 @@ * along with this program. If not, see