greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Merge pull request #232 from BigBotNetwork/greg-dev

Browse source 
Merged!
This commit is contained in:
Skidder 2019-12-21 21:52:35 +01:00 • committed by GitHub
commit 54e47fcdb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -5,7 +5,7 @@
<groupId>Hadder</groupId> <groupId>Hadder</groupId>
<artifactId>Hadder</artifactId> <artifactId>Hadder</artifactId>
<version>0.10-ALPHA</version> <version>0.1-BETA</version>
<name>Hadder</name> <name>Hadder</name>

1
src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java
View file

@ -9,7 +9,6 @@ import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.core.Perm; import com.bbn.hadder.core.Perm;
import com.bbn.hadder.core.Perms; import com.bbn.hadder.core.Perms;
import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.Permission;
@Perms(Perm.MANAGE_SERVER) @Perms(Perm.MANAGE_SERVER)
public class InviteDetectCommand implements Command { public class InviteDetectCommand implements Command {

1
src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java
View file

@ -5,7 +5,6 @@ import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.core.Perm; import com.bbn.hadder.core.Perm;
import com.bbn.hadder.core.Perms; import com.bbn.hadder.core.Perms;
import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.Permission;
@Perms(Perm.MANAGE_SERVER) @Perms(Perm.MANAGE_SERVER)
public class PrefixCommand implements Command { public class PrefixCommand implements Command {

2
src/main/java/com/bbn/hadder/commands/owner/TestCommand.java
View file

@ -2,8 +2,6 @@ package com.bbn.hadder.commands.owner;
import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent; 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; import com.bbn.hadder.utils.MessageEditor.MessageType;
/* /*

4
src/main/java/com/bbn/hadder/core/CommandHandler.java
View file

@ -35,8 +35,7 @@ public class CommandHandler {
CommandEvent commandEvent = new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), rethink, CommandEvent commandEvent = new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), rethink,
config, this, helpCommand, new MessageEditor(rethink, event.getAuthor())); config, this, helpCommand, new MessageEditor(rethink, event.getAuthor()));
if (cmd.getClass().getAnnotations().length>0) { if (cmd.getClass().getAnnotations().length > 0 && !Arrays.asList(cmd.getClass().getAnnotations()).contains(Perms.class)) {
if (!Arrays.asList(cmd.getClass().getAnnotations()).contains(Perms.class)) {
for (Perm perm : cmd.getClass().getAnnotation(Perms.class).value()) { for (Perm perm : cmd.getClass().getAnnotation(Perms.class).value()) {
if (!perm.check(commandEvent)) { if (!perm.check(commandEvent)) {
commandEvent.getTextChannel() commandEvent.getTextChannel()
@ -46,7 +45,6 @@ public class CommandHandler {
} }
} }
} }
}
cmd.executed(args, commandEvent); cmd.executed(args, commandEvent);
return; return;