CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-15 23:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added null check on send usage. Added return true on no permission.

Browse Source 
Fixes the bug where every one could use every command.
This commit is contained in:
Jos van 't Hof
2012-04-13 19:22:55 +02:00
parent ff15dc2ee1
commit 79a4217c64
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Handlers/CommandHandler.java
View File

@@ -25,7 +25,18 @@ public class CommandHandler implements CommandExecutor{
plugin.getCommand("rs").setExecutor(this);
registerCommands(new RandomSpawnCommandExecutor[]{
new RandomSpawnBedsCommand(), new RandomSpawnDisableCommand(), new RandomSpawnEnableCommand(), new RandomSpawnFirstJoinCommand(), new RandomSpawnHelpCommand(), new RandomSpawnInfoCommand(), new RandomSpawnKeepSpawnsCommand(), new RandomSpawnReloadCommand(), new RandomSpawnSetAreaCommand(), new RandomSpawnSetFirstSpawnCommand(), new RandomSpawnTpFirstSpawnCommand(), new RandomSpawnUnsetFirstSpawnCommand()
new BedsCommand(),
new DisableCommand(),
new EnableCommand(),
new FirstJoinCommand(),
new RandomSpawnHelpCommand(),
new InfoCommand(),
new RandomSpawnKeepSpawnsCommand(),
new RandomSpawnReloadCommand(),
new RandomSpawnSetAreaCommand(),
new RandomSpawnSetFirstSpawnCommand(),
new RandomSpawnTpFirstSpawnCommand(),
new RandomSpawnUnsetFirstSpawnCommand(),
});
}
@@ -54,11 +65,12 @@ public class CommandHandler implements CommandExecutor{
return true;
}
if (!sender.hasPermission(commandExecutor.getPermission())){
if (commandExecutor.getPermission() != null && !sender.hasPermission(commandExecutor.getPermission())){
sender.sendMessage("You don't have the permission to use this command!");
return true;
}
if (commandExecutor.onCommand(sender, Arrays.asList(args).subList(1, args.length)) == false){
if (commandExecutor.onCommand(sender, Arrays.asList(args).subList(1, args.length)) == false && commandExecutor.getUsage() != null){
sender.sendMessage(commandExecutor.getUsage());
}