Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-24 11:38:26 +01:00
Code Issues Projects Releases Wiki Activity

Allow selected NPC redefinition in all cases

Browse Source
This commit is contained in:
fullwall 2012-09-09 18:02:39 +08:00
parent 1a8d4fe7f8
commit f62e536473
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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