Fix NPE in GuildRoleUpdateHandler (#1903)

discord-jda · Nov 26, 2021 · 8cc5675 · 8cc5675
1 parent 0e972b2
commit 8cc5675
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/net/dv8tion/jda/api/events/role/update/RoleUpdateIconEvent.java b/src/main/java/net/dv8tion/jda/api/events/role/update/RoleUpdateIconEvent.java
@@ -34,7 +34,7 @@ public class RoleUpdateIconEvent extends GenericRoleUpdateEvent<RoleIcon>
 {
     public static final String IDENTIFIER = "icon";
 
-    public RoleUpdateIconEvent(@Nonnull JDA api, long responseNumber, @Nonnull Role role, @Nonnull RoleIcon oldIcon)
+    public RoleUpdateIconEvent(@Nonnull JDA api, long responseNumber, @Nonnull Role role, @Nullable RoleIcon oldIcon)
     {
         super(api, responseNumber, role, oldIcon, role.getIcon(), IDENTIFIER);
     }

diff --git a/src/main/java/net/dv8tion/jda/internal/entities/RoleImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/RoleImpl.java
@@ -330,7 +330,7 @@ public RoleTags getTags()
         return tags == null ? RoleTagsImpl.EMPTY : tags;
     }
 
-    @Nonnull
+    @Nullable
     @Override
     public RoleIcon getIcon()
     {

diff --git a/src/main/java/net/dv8tion/jda/internal/handle/GuildRoleUpdateHandler.java b/src/main/java/net/dv8tion/jda/internal/handle/GuildRoleUpdateHandler.java
@@ -126,12 +126,12 @@ protected Long handleInternally(DataObject content)
         }
 
         RoleIcon oldIcon = role.getIcon();
-        if (!Objects.equals(oldIcon.getIconId(), iconId) || !Objects.equals(oldIcon.getEmoji(), emoji))
+        RoleIcon newIcon = iconId == null && emoji == null
+                ? null
+                : new RoleIcon(iconId, emoji, roleId);
+        if (!Objects.equals(oldIcon, newIcon))
         {
-            if (iconId == null && emoji == null)
-                role.setIcon(null);
-            else
-                role.setIcon(new RoleIcon(iconId, emoji, roleId));
+            role.setIcon(newIcon);
             getJDA().handleEvent(
                     new RoleUpdateIconEvent(
                             getJDA(), responseNumber,