Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-27 06:42:57 +02:00
Code Issues Projects Releases Wiki Activity

Better usability for commands which require an NPC to be selected

Browse Source
This commit is contained in:
fullwall 2012-09-09 17:52:00 +08:00
parent 7d214ffce9
commit 01ec75e254
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/net/citizensnpcs/command/CommandManager.java
View File

@ -15,6 +15,7 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.trait.trait.MobType;
import net.citizensnpcs.api.trait.trait.Owner;
@ -94,14 +95,39 @@ public class CommandManager {
if (!hasPermission(method, sender) && methodArgs[1] instanceof Player)
throw new NoPermissionsException();
Command cmd = method.getAnnotation(Command.class);
CommandContext context = new CommandContext(args);
if (context.argsLength() < cmd.min())
throw new CommandUsageException("Too few arguments.", getUsage(args, cmd));
if (cmd.max() != -1 && context.argsLength() > cmd.max())
throw new CommandUsageException("Too many arguments.", getUsage(args, cmd));
if (!context.getFlags().contains('*')) {
for (char flag : context.getFlags())
if (cmd.flags().indexOf(String.valueOf(flag)) == -1)
throw new CommandUsageException("Unknown flag: " + flag, getUsage(args, cmd));
}
methodArgs[0] = context;
Requirements cmdRequirements = requirements.get(method);
if (cmdRequirements != null) {
NPC npc = (NPC) methodArgs[2];
// Requirements
if (cmdRequirements.selected() && npc == null)
throw new RequirementMissingException(
"You must have an NPC selected to execute that command.");
if (cmdRequirements.selected() && npc == null) {
boolean canRedefineSelected = context.hasValueFlag("id")
&& sender.hasPermission("npc.select");
String error = "You must have an NPC selected to execute that command.";
if (canRedefineSelected) {
npc = CitizensAPI.getNPCRegistry().getById(context.getFlagInteger("id"));
if (npc == null)
error += " Couldn't find any NPC with ID " + context.getFlagInteger("id") + ".";
}
throw new RequirementMissingException(error);
}
if (cmdRequirements.ownership() && npc != null && !sender.hasPermission("citizens.admin")
&& !npc.getTrait(Owner.class).isOwnedBy(sender))
@ -123,23 +149,6 @@ public class CommandManager {
}
}
Command cmd = method.getAnnotation(Command.class);
CommandContext context = new CommandContext(args);
if (context.argsLength() < cmd.min())
throw new CommandUsageException("Too few arguments.", getUsage(args, cmd));
if (cmd.max() != -1 && context.argsLength() > cmd.max())
throw new CommandUsageException("Too many arguments.", getUsage(args, cmd));
if (!context.getFlags().contains('*')) {
for (char flag : context.getFlags())
if (cmd.flags().indexOf(String.valueOf(flag)) == -1)
throw new CommandUsageException("Unknown flag: " + flag, getUsage(args, cmd));
}
methodArgs[0] = context;
Object instance = instances.get(method);
try {
method.invoke(instance, methodArgs);

2
src/main/java/net/citizensnpcs/command/command/NPCCommands.java
View File

@ -362,7 +362,7 @@ public class NPCCommands {
@Command(
aliases = { "npc" },
usage = "moveto",
usage = "moveto (--x x --y y --z z --world world --pitch pitch --yaw yaw",
desc = "Teleports a NPC to a given location",
modifiers = "moveto",
min = 1,