Merge Greg's branch into Hax's branch #228

Merged
greg6775 merged 21 commits from greg-dev into hax-dev 2019-12-21 18:10:28 +01:00
Showing only changes of commit 3e1de81eb8 - Show all commits

View file

@ -10,58 +10,58 @@ public enum Perm {
BOT_OWNER() { BOT_OWNER() {
@Override @Override
public boolean check(CommandEvent commandEvent) { public boolean check(CommandEvent event) {
return commandEvent.getConfig().getOwners().contains(commandEvent.getAuthor().getIdLong()); return event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
} }
}, },
MANAGE_MESSAGES { MANAGE_MESSAGES {
@Override @Override
public boolean check(CommandEvent commandEvent) { public boolean check(CommandEvent event) {
return commandEvent.getMember().hasPermission(Permission.MESSAGE_MANAGE); return event.getMember().hasPermission(Permission.MESSAGE_MANAGE);
} }
}, },
EMBED_MESSAGES { EMBED_MESSAGES {
@Override @Override
public boolean check(CommandEvent commandEvent) { public boolean check(CommandEvent event) {
return commandEvent.getMember().hasPermission(Permission.MESSAGE_EMBED_LINKS); return event.getMember().hasPermission(Permission.MESSAGE_EMBED_LINKS);
} }
}, },
BAN_MEMBERS { BAN_MEMBERS {
@Override @Override
public boolean check(CommandEvent commandEvent) { public boolean check(CommandEvent event) {
return commandEvent.getMember().hasPermission(Permission.BAN_MEMBERS); return event.getMember().hasPermission(Permission.BAN_MEMBERS);
} }
}, },
KICK_MEMBERS { KICK_MEMBERS {
@Override @Override
public boolean check(CommandEvent commandEvent) { public boolean check(CommandEvent event) {
return commandEvent.getMember().hasPermission(Permission.KICK_MEMBERS); return event.getMember().hasPermission(Permission.KICK_MEMBERS);
} }
}, },
MANAGE_SERVER { MANAGE_SERVER {
@Override @Override
public boolean check(CommandEvent commandEvent) { public boolean check(CommandEvent event) {
return commandEvent.getMember().hasPermission(Permission.MANAGE_SERVER); return event.getMember().hasPermission(Permission.MANAGE_SERVER);
} }
}, },
MANAGE_ROLES { MANAGE_ROLES {
@Override @Override
public boolean check(CommandEvent commandEvent) { public boolean check(CommandEvent event) {
return commandEvent.getMember().hasPermission(Permission.MANAGE_ROLES); return event.getMember().hasPermission(Permission.MANAGE_ROLES);
} }
}, },
CHANGE_NICKNAME { CHANGE_NICKNAME {
@Override @Override
public boolean check(CommandEvent commandEvent) { public boolean check(CommandEvent event) {
return commandEvent.getMember().hasPermission(Permission.NICKNAME_CHANGE); return event.getMember().hasPermission(Permission.NICKNAME_CHANGE);
} }
}, },
ADMIN_PERMISSIONS { ADMIN_PERMISSIONS {
@Override @Override
public boolean check(CommandEvent commandEvent) { public boolean check(CommandEvent event) {
return commandEvent.getMember().hasPermission(Permission.ADMINISTRATOR); return event.getMember().hasPermission(Permission.ADMINISTRATOR);
} }
}; };
public abstract boolean check(CommandEvent commandEvent); public abstract boolean check(CommandEvent event);
} }