Fixed the Avatar Command

beanbeanjuice · May 5, 2023 · 8d1ddb0 · 8d1ddb0
1 parent 34442c2
commit 8d1ddb0
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/main/java/com/beanbeanjuice/command/fun/AvatarCommand.java b/src/main/java/com/beanbeanjuice/command/fun/AvatarCommand.java
@@ -34,12 +34,28 @@ public void handle(@NotNull SlashCommandInteractionEvent event) {
                 user = event.getOption("user").getAsUser();
             name = user.getName();
             url = user.getAvatarUrl();
+
+            if (url == null) {
+                event.getHook().sendMessageEmbeds(Helper.errorEmbed(
+                        "No User Avatar",
+                        "The specified user does not have a Discord avatar."
+                )).queue();
+                return;
+            }
         } else {
             Member member = event.getMember();
             if (event.getOption("user") != null)
                 member = event.getOption("user").getAsMember();
             name = member.getUser().getName();
             url = member.getAvatarUrl();
+
+            if (url == null) {
+                event.getHook().sendMessageEmbeds(Helper.errorEmbed(
+                        "No User Server Avatar",
+                        "The specified user does not have a custom avatar for this server."
+                )).queue();
+                return;
+            }
         }
 
         event.getHook().sendMessageEmbeds(avatarEmbed(name, url)).queue();