From 4995dc3544be37dfb02cde54442c72b4664499e2 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Thu, 26 Aug 2021 09:38:12 -0400 Subject: 1.3.0 beta 2, bug fixes, added more block settings, added more config options --- .../tylermurphy/hideAndSeek/CommandHandler.java | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'src/main/java/net/tylermurphy/hideAndSeek/CommandHandler.java') diff --git a/src/main/java/net/tylermurphy/hideAndSeek/CommandHandler.java b/src/main/java/net/tylermurphy/hideAndSeek/CommandHandler.java index b1a6f89..d62d153 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/CommandHandler.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/CommandHandler.java @@ -36,16 +36,22 @@ public class CommandHandler { public static boolean handleCommand(CommandSender sender, Command cmd, String label, String[] args) { if(sender instanceof Player == false) { sender.sendMessage(errorPrefix + "This command can only be run as a player."); - } else if(args.length < 1) { - COMMAND_REGISTER.get("about").execute(sender, new String[0]); - } else if(!COMMAND_REGISTER.containsKey(args[0].toLowerCase())) { - COMMAND_REGISTER.get("about").execute(sender, Arrays.copyOfRange(args, 1, args.length)); + } else if(args.length < 1 || !COMMAND_REGISTER.containsKey(args[0].toLowerCase()) ) { + if(permissionsRequired && !sender.hasPermission("hideandseek.about")) { + sender.sendMessage(errorPrefix + "You are not allowed to run this command."); + } else { + COMMAND_REGISTER.get("about").execute(sender, null); + } } else { - try { - COMMAND_REGISTER.get(args[0].toLowerCase()).execute(sender,Arrays.copyOfRange(args, 1, args.length)); - } catch (Exception e) { - sender.sendMessage(errorPrefix + "An error has occured."); - e.printStackTrace(); + if(permissionsRequired && !sender.hasPermission("hideandseek."+args[0].toLowerCase())) { + sender.sendMessage(errorPrefix + "You are not allowed to run this command."); + } else { + try { + COMMAND_REGISTER.get(args[0].toLowerCase()).execute(sender,Arrays.copyOfRange(args, 1, args.length)); + } catch (Exception e) { + sender.sendMessage(errorPrefix + "An error has occured."); + e.printStackTrace(); + } } } return true; -- cgit v1.2.3-freya