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 04716fbc07 - Show all commits

View file

@ -13,49 +13,49 @@ public enum Perm {
public boolean check(CommandEvent event) { public boolean check(CommandEvent event) {
return event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); return event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
} }
}, },
MANAGE_MESSAGES { MANAGE_MESSAGES {
@Override @Override
public boolean check(CommandEvent event) { public boolean check(CommandEvent event) {
return event.getMember().hasPermission(Permission.MESSAGE_MANAGE); return event.getMember().hasPermission(Permission.MESSAGE_MANAGE);
} }
}, },
EMBED_MESSAGES { EMBED_MESSAGES {
@Override @Override
public boolean check(CommandEvent event) { public boolean check(CommandEvent event) {
return event.getMember().hasPermission(Permission.MESSAGE_EMBED_LINKS); return event.getMember().hasPermission(Permission.MESSAGE_EMBED_LINKS);
} }
}, },
BAN_MEMBERS { BAN_MEMBERS {
@Override @Override
public boolean check(CommandEvent event) { public boolean check(CommandEvent event) {
return event.getMember().hasPermission(Permission.BAN_MEMBERS); return event.getMember().hasPermission(Permission.BAN_MEMBERS);
} }
}, },
KICK_MEMBERS { KICK_MEMBERS {
@Override @Override
public boolean check(CommandEvent event) { public boolean check(CommandEvent event) {
return event.getMember().hasPermission(Permission.KICK_MEMBERS); return event.getMember().hasPermission(Permission.KICK_MEMBERS);
} }
}, },
MANAGE_SERVER { MANAGE_SERVER {
@Override @Override
public boolean check(CommandEvent event) { public boolean check(CommandEvent event) {
return event.getMember().hasPermission(Permission.MANAGE_SERVER); return event.getMember().hasPermission(Permission.MANAGE_SERVER);
} }
}, },
MANAGE_ROLES { MANAGE_ROLES {
@Override @Override
public boolean check(CommandEvent event) { public boolean check(CommandEvent event) {
return event.getMember().hasPermission(Permission.MANAGE_ROLES); return event.getMember().hasPermission(Permission.MANAGE_ROLES);
} }
}, },
CHANGE_NICKNAME { CHANGE_NICKNAME {
@Override @Override
public boolean check(CommandEvent event) { public boolean check(CommandEvent event) {
return event.getMember().hasPermission(Permission.NICKNAME_CHANGE); return event.getMember().hasPermission(Permission.NICKNAME_CHANGE);
} }
}, },
ADMINISTRATOR { ADMINISTRATOR {
@Override @Override
public boolean check(CommandEvent event) { public boolean check(CommandEvent event) {
@ -65,7 +65,8 @@ public enum Perm {
MANAGE_WEBHOOKS { MANAGE_WEBHOOKS {
@Override @Override
public boolean check(CommandEvent event) { public boolean check(CommandEvent event) {
return event.getMember().hasPermission(Permission.MANAGE_WEBHOOKS); } return event.getMember().hasPermission(Permission.MANAGE_WEBHOOKS);
}
}; };
public abstract boolean check(CommandEvent event); public abstract boolean check(CommandEvent event);