Merge remote-tracking branch 'origin/master' into hax-dev

This commit is contained in:
Hax 2019-10-31 15:39:07 +01:00
commit 5dc2e1f832
2 changed files with 6 additions and 6 deletions

View file

@ -17,13 +17,13 @@ public class CommandListener extends ListenerAdapter {
@Override @Override
public void onMessageReceived(MessageReceivedEvent event) { public void onMessageReceived(MessageReceivedEvent event) {
if (event.isFromType(ChannelType.TEXT)) { if (event.isFromType(ChannelType.TEXT)) {
if (event.getMessage().getContentRaw().startsWith(Rethink.get("user", "id", event.getAuthor().getId(), "prefix"))) {
if (!event.getAuthor().isBot()) { if (!event.getAuthor().isBot()) {
if (event.getMessage().getContentRaw().startsWith(Rethink.get("user", "id", event.getAuthor().getId(), "prefix"))) {
CommandHandler.handleCommand(CommandParser.parser(event.getMessage().getContentRaw(), event)); CommandHandler.handleCommand(CommandParser.parser(event.getMessage().getContentRaw(), event));
}
} else if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_ADD_REACTION)) { } else if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_ADD_REACTION)) {
event.getMessage().addReaction("🙅").queue(); event.getMessage().addReaction("🙅").queue();
} }
} }
} }
}
} }