From eea55bd75e25a1e5ab387c33bfc20a0522c784e0 Mon Sep 17 00:00:00 2001
From: Robin Kupper <robbzkupper@web.de>
Date: Sun, 24 Jul 2011 10:03:24 +0200
Subject: [PATCH] Added bukkit permissions

---
 src/de/diddiz/LogBlock/LogBlock.java |  6 ++--
 src/plugin.yml                       | 45 +++++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/src/de/diddiz/LogBlock/LogBlock.java b/src/de/diddiz/LogBlock/LogBlock.java
index 6b8ebd1..4315948 100644
--- a/src/de/diddiz/LogBlock/LogBlock.java
+++ b/src/de/diddiz/LogBlock/LogBlock.java
@@ -241,8 +241,10 @@ public class LogBlock extends JavaPlugin
 	boolean hasPermission(CommandSender sender, String permission) {
 		if (permissions != null && sender instanceof Player)
 			return permissions.permission((Player)sender, permission);
-		if (permission.equals("logblock.lookup") || permission.equals("logblock.hide") || permission.equals("logblock.rollback") || permission.equals("logblock.tp") || permission.equals("logblock.clearlog"))
-			return sender.isOp();
+		if (sender instanceof ConsoleCommandSender)
+			return true;
+		if (sender instanceof Player)
+			return ((Player)sender).hasPermission(permission);
 		return true;
 	}
 
diff --git a/src/plugin.yml b/src/plugin.yml
index ba0ba15..3d505f1 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -9,4 +9,47 @@ commands:
   lb:
     description: 'LogBlock commands.'
     usage: 'Usage: /<command> help'
-    aliases: []
\ No newline at end of file
+    aliases: []
+permissions:
+    logblock.*:
+        description: Gives access to all LogBlock commands
+        children:
+            logblock.tool: true
+            logblock.toolblock: true
+            logblock.lookup: true
+            logblock.rollback: true
+            logblock.clearlog: true
+            logblock.hide: true
+            logblock.tp: true
+            logblock.me: true
+            logblock.ignoreRestrictions: true
+    logblock.tool:
+        description: 'Allows using the tool (the woodpickaxe) with default query (toolQuery in config)'
+        default: true
+    logblock.toolblock:
+        description: 'Allows using the tool block (the bedrock block) with default query (toolBlockQuery in config)'
+        default: true
+    logblock.lookup:
+        description: 'Grants access to /lb lookup commands and allows defining custom tool queries'
+        default: op
+    logblock.rollback:
+        description: 'Allows rollback, redo and write logfiles'
+        default: op
+    logblock.clearlog:
+        description: 'Allows to use /lb clearlog'
+        default: op
+    logblock.hide:
+        description: 'Allows to hide from logging'
+        default: op
+    logblock.tp:
+        description: 'Allows to use /lb tp'
+        default: op
+    logblock.tp:
+        description: 'Allows to use /lb tp'
+        default: op
+    logblock.me:
+        description: 'Allows to see oneselfs stats with /lb me'
+        default: true
+    logblock.ignoreRestrictions:
+        description: 'Allows to ignore the rollback restrictions rollback.maxTime and rollback.maxArea'
+        default: op
\ No newline at end of file