Fixed permission issues

bramhaag · Jan 20, 2017 · 2a5fd27 · 2a5fd27
1 parent c5eea7a
commit 2a5fd27
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.bramhaag</groupId>
     <artifactId>Guilds</artifactId>
-    <version>1.3.2-RELEASE</version>
+    <version>1.3.3-RELEASE</version>
 
     <repositories>
         <repository>

diff --git a/src/main/java/me/bramhaag/guilds/commands/CommandAdmin.java b/src/main/java/me/bramhaag/guilds/commands/CommandAdmin.java
@@ -16,7 +16,7 @@
 public class CommandAdmin extends CommandBase {
 
     public CommandAdmin() {
-        super("admin", "Admin command for managing guilds", "guilds.commands.admin", true, null, new String[] { "<remove | info> <guild name>, or <addplayer | removeplayer> <guild name> <player name>" }, 2, 3);
+        super("admin", "Admin command for managing guilds", "guilds.command.admin", true, null, new String[] { "<remove | info> <guild name>, or <addplayer | removeplayer> <guild name> <player name>" }, 2, 3);
     }
 
     @Override

diff --git a/src/main/java/me/bramhaag/guilds/commands/CommandCreate.java b/src/main/java/me/bramhaag/guilds/commands/CommandCreate.java
@@ -12,7 +12,7 @@
 public class CommandCreate extends CommandBase {
 
     public CommandCreate() {
-        super("create", "Create a guild", "guilds.commands.create", false, new String[] { "c" }, new String[] { "<name>" }, 1, 1);
+        super("create", "Create a guild", "guilds.command.create", false, new String[] { "c" }, new String[] { "<name>" }, 1, 1);
     }
 
     @Override

diff --git a/src/main/java/me/bramhaag/guilds/commands/CommandInfo.java b/src/main/java/me/bramhaag/guilds/commands/CommandInfo.java
@@ -13,7 +13,7 @@
 public class CommandInfo extends CommandBase {
 
     public CommandInfo() {
-        super("info", "View your guild's info", "guilds.commands.info", false, null, null, 0, 0);
+        super("info", "View your guild's info", "guilds.command.info", false, null, null, 0, 0);
     }
 
     @Override

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -10,7 +10,7 @@ commands:
     description: See the Guild commands
 
 permissions:
-  guilds.command.*:
+  guilds.group.admin:
     description: All commands for the Guilds plugin
     children:
       guilds.command.accept: true
@@ -31,8 +31,8 @@ permissions:
       guilds.command.reload: true
       guilds.command.role: true
       guilds.command.update: true
-    default: OP
-  guilds.command.member.*:
+    default: op
+  guilds.group.member:
     description: All commands for the Guilds plugin
     children:
       guilds.command.accept: true
@@ -50,4 +50,38 @@ permissions:
       guilds.command.prefix: true
       guilds.command.promote: true
       guilds.command.role: true
-    default: true
+    default: true
+  guilds.command.accept:
+    description: Accept invite to a guild
+  guilds.command.admin:
+    description: Access to admin commands
+  guilds.command.boot:
+    description: Kick a member from your guild
+  guilds.command.cancel:
+    description: Cancel a command
+  guilds.command.chat:
+    description: Use guild chat
+  guilds.command.confirm:
+    description: Confirm a command
+  guilds.command.create:
+    description: Create a guild
+  guilds.command.delete:
+    description: Delete your guild
+  guilds.command.demote:
+    description: Demote a member of your guild
+  guilds.command.help:
+    description: Use /guilds help command
+  guilds.command.info:
+    description: View Guild's info
+  guilds.command.invite:
+    description: Invite a member to your guild
+  guilds.command.leave:
+    description: Leave your guild
+  guilds.command.prefix:
+    description: Change your guild's prefix
+  guilds.command.promote:
+    description: Promote a member of your guild
+  guilds.command.reload:
+    description: Reload Guilds
+  guilds.command.role:
+    description: Change the role of a member from your guild