Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix NPE in GuildRoleUpdateHandler #1903

Merged
merged 2 commits into from
Nov 26, 2021
Merged

Fix NPE in GuildRoleUpdateHandler #1903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caa7567
fix NPE in GuildRoleUpdateHandler
sebm253 Nov 24, 2021
9445db5
proper logic
sebm253 Nov 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/net/dv8tion/jda/api/events/role/update/RoleUpdateIconEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/dv8tion/jda/internal/entities/RoleImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ public RoleTags getTags()
return tags == null ? RoleTagsImpl.EMPTY : tags;
}

@Nonnull
@Nullable
@Override
public RoleIcon getIcon()
{
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/net/dv8tion/jda/internal/handle/GuildRoleUpdateHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down