Fix NPE in ChannelManager#sync

discord-jda · May 17, 2020 · 1c24e7a · 1c24e7a
1 parent e66244e
commit 1c24e7a
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/main/java/net/dv8tion/jda/internal/managers/ChannelManagerImpl.java b/src/main/java/net/dv8tion/jda/internal/managers/ChannelManagerImpl.java
@@ -216,18 +216,18 @@ public ChannelManagerImpl sync(@Nonnull GuildChannel syncSource)
             this.overridesAdd.clear();
 
             //set all current overrides to-be-removed
-            getChannel().getPermissionOverrides().forEach(permO ->
-                this.overridesRem.add(getId(permO.isRoleOverride() ? permO.getRole() : permO.getMember()))
-            );
+            getChannel().getPermissionOverrides()
+                .stream()
+                .mapToLong(PermissionOverride::getIdLong)
+                .forEach(overridesRem::add);
 
             //re-add all perm-overrides of syncSource
-            syncSource.getPermissionOverrides().forEach(permO ->
-            {
-                int type = permO.isRoleOverride() ? PermOverrideData.ROLE_TYPE : PermOverrideData.MEMBER_TYPE;
-                long id = getId(permO.isRoleOverride() ? permO.getRole() : permO.getMember());
+            syncSource.getPermissionOverrides().forEach(override -> {
+                int type = override.isRoleOverride() ? PermOverrideData.ROLE_TYPE : PermOverrideData.MEMBER_TYPE;
+                long id = override.getIdLong();
 
                 this.overridesRem.remove(id);
-                this.overridesAdd.put(id, new PermOverrideData(type, id, permO.getAllowedRaw(), permO.getDeniedRaw()));
+                this.overridesAdd.put(id, new PermOverrideData(type, id, override.getAllowedRaw(), override.getDeniedRaw()));
             });
 
             set |= PERMISSION;