Merge pull request #232 from BigBotNetwork/greg-dev

Merged!
BBN-Holding · Dec 21, 2019 · 54e47fc · 54e47fc
2 parents ec46776 + d482639
commit 54e47fc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>Hadder</groupId>
   <artifactId>Hadder</artifactId>
-  <version>0.10-ALPHA</version>
+  <version>0.1-BETA</version>
 
   <name>Hadder</name>
 

diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java
@@ -9,7 +9,6 @@
 import com.bbn.hadder.core.Perm;
 import com.bbn.hadder.core.Perms;
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.Permission;
 
 @Perms(Perm.MANAGE_SERVER)
 public class InviteDetectCommand implements Command {

diff --git a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java
@@ -5,7 +5,6 @@
 import com.bbn.hadder.core.Perm;
 import com.bbn.hadder.core.Perms;
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.Permission;
 
 @Perms(Perm.MANAGE_SERVER)
 public class PrefixCommand implements Command {

diff --git a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java
@@ -2,8 +2,6 @@
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.core.Perm;
-import com.bbn.hadder.core.Perms;
 import com.bbn.hadder.utils.MessageEditor.MessageType;
 
 /*

diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java
@@ -35,15 +35,13 @@ public void handle(MessageReceivedEvent event, Rethink rethink, String prefix) {
 
                     CommandEvent commandEvent = new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), rethink,
                             config, this, helpCommand, new MessageEditor(rethink, event.getAuthor()));
-                    if (cmd.getClass().getAnnotations().length>0) {
-                        if (!Arrays.asList(cmd.getClass().getAnnotations()).contains(Perms.class)) {
-                            for (Perm perm : cmd.getClass().getAnnotation(Perms.class).value()) {
-                                if (!perm.check(commandEvent)) {
-                                    commandEvent.getTextChannel()
-                                            .sendMessage(commandEvent.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build())
-                                            .queue();
-                                    return;
-                                }
+                    if (cmd.getClass().getAnnotations().length > 0 && !Arrays.asList(cmd.getClass().getAnnotations()).contains(Perms.class)) {
+                        for (Perm perm : cmd.getClass().getAnnotation(Perms.class).value()) {
+                            if (!perm.check(commandEvent)) {
+                                commandEvent.getTextChannel()
+                                        .sendMessage(commandEvent.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build())
+                                        .queue();
+                                return;
                             }
                         }
                     }