Allow selected NPC redefinition in all cases

This commit is contained in:
fullwall 2012-09-09 18:02:39 +08:00
parent 1a8d4fe7f8
commit f62e536473

View File

@ -117,7 +117,7 @@ public class CommandManager {
NPC npc = (NPC) methodArgs[2];
// Requirements
if (cmdRequirements.selected() && npc == null) {
if (cmdRequirements.selected()) {
boolean canRedefineSelected = context.hasValueFlag("id")
&& sender.hasPermission("npc.select");
String error = "You must have an NPC selected to execute that command.";
@ -126,6 +126,7 @@ public class CommandManager {
if (npc == null)
error += " Couldn't find any NPC with ID " + context.getFlagInteger("id") + ".";
}
if (npc == null)
throw new RequirementMissingException(error);
}