Update src/main/java/net/citizensnpcs/Citizens.java

This commit is contained in:
fullwall 2012-12-10 22:17:52 +08:00
parent 710780a3ff
commit af81d49565

View File

@ -137,15 +137,14 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
if (!commands.hasCommand(command, modifier) && !modifier.isEmpty()) {
return suggestClosestModifier(sender, command.getName(), modifier);
}
if (!isEnabled())
return false;
NPC npc = selector.getSelected(sender);
NPC npc = selector == null ? null : selector.getSelected(sender);
// TODO: change the args supplied to a context style system for
// flexibility (ie. adding more context in the future without
// changing everything)
return commands.executeSafe(command, args, sender, sender, npc);
Object[] methodArgs = {sender, npc};
return commands.executeSafe(command, args, sender, methodArgs);
}
@Override