1.3.0 beta 2, bug fixes, added more block settings, added more config options

1 files changed, 15 insertions, 9 deletions

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;