From e664b1845592ef90b0d418f88b52fb5468aa8075 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 31 Oct 2019 11:14:07 +0100 Subject: [PATCH] Fixing NullPointer --- .../com/bbn/hadder/commands/moderation/KickCommand.java | 4 ++-- .../java/com/bbn/hadder/listener/CommandListener.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java index 843899b..00bfed8 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -38,10 +38,10 @@ public class KickCommand implements Command { } else if (event.getMessage().getMentionedMembers().size() == 0) { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to mention a user!").build()).queue(); - } else { + } else { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("We will be adding multiple kicking within a command in the future.").build()).queue(); - } + } } } diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java index ae07609..ff9b9cc 100644 --- a/src/main/java/com/bbn/hadder/listener/CommandListener.java +++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java @@ -17,12 +17,12 @@ public class CommandListener extends ListenerAdapter { @Override public void onMessageReceived(MessageReceivedEvent event) { 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)); - } else if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_ADD_REACTION)) { - event.getMessage().addReaction("🙅").queue(); } + } else if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_ADD_REACTION)) { + event.getMessage().addReaction("🙅").queue(); } } }