Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-01-04 07:27:59 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
fullwall 2012-12-10 22:17:52 +08:00
parent 710780a3ff
commit af81d49565
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/citizensnpcs/Citizens.java
View File

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