Merge remote-tracking branch 'origin/master'

Author: Scarsz

src/main/java/github/scarsz/discordsupportbot/DiscordUtil.java

@@ -35,6 +35,7 @@ public void onGenericEvent(Event event) {
     public static GuildMessageReceivedEvent pullGuildMessageReceivedEvent(User user) {
         while (1 < 2) {
             GuildMessageReceivedEvent pulled = (GuildMessageReceivedEvent) pullEvent(GuildMessageReceivedEvent.class);
+            if (pulled.getMember() == null || pulled.getMember().getUser().isBot()) continue;
             if (pulled.getMember().getUser().equals(user)) {
                 return pulled;
             }
@@ -44,6 +45,7 @@ public static GuildMessageReceivedEvent pullGuildMessageReceivedEvent(User user)
     public static GuildMessageReactionAddEvent pullGuildMessageReactionAddEvent(User user) {
         while (1 < 2) {
             GuildMessageReactionAddEvent pulled = (GuildMessageReactionAddEvent) pullEvent(GuildMessageReactionAddEvent.class);
+            if (pulled.getMember() == null || pulled.getMember().getUser().isBot()) continue;
             if (pulled.getMember().getUser().equals(user)) {
                 return pulled;
             }
@@ -53,6 +55,7 @@ public static GuildMessageReactionAddEvent pullGuildMessageReactionAddEvent(Mess
         message.addReaction("✅").queue();
         while (1 < 2) {
             GuildMessageReactionAddEvent pulled = (GuildMessageReactionAddEvent) pullEvent(GuildMessageReactionAddEvent.class);
+            if (pulled.getMember() == null || pulled.getMember().getUser().isBot()) continue;
             if (pulled.getMember().getUser().equals(user) && pulled.getMessageId().equals(message.getId())) {
                 return pulled;
             }

src/main/java/github/scarsz/discordsupportbot/listeners/DiscordSetupListener.java

@@ -31,7 +31,7 @@ public void onGuildMessageReceived(GuildMessageReceivedEvent event) {
 
     public void handleSetup(GuildMessageReceivedEvent event) {
         if (guildsBeingSetup.contains(event.getGuild().getId())) return;
-        if (!event.getMember().isOwner()) return;
+        if (event.getMember() == null || event.getMember().getUser().isBot() || !event.getMember().isOwner()) return;
 
         GuildInfo guildInfo = DiscordSupportBot.getGuildInfo(event.getGuild());
         DiscordSupportBot.get().getRegisteredGuilds().remove(guildInfo);