Fix symmetricity of CustomEmojiImpl/RichCustomEmojiImpl#equals (#2519)

discord-jda · Aug 14, 2023 · 79b1b56 · 79b1b56
1 parent 72aaf10
commit 79b1b56
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/emoji/CustomEmojiImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/emoji/CustomEmojiImpl.java
@@ -90,7 +90,7 @@ public String getFormatted()
  @Override
  public int hashCode()
  {
- return Objects.hash(name, id, animated);
+ return Long.hashCode(id);
  }
 
  @Override
@@ -101,7 +101,7 @@ public boolean equals(Object obj)
  if (!(obj instanceof CustomEmoji))
  return false;
  CustomEmoji other = (CustomEmoji) obj;
- return other.getIdLong() == id;
+ return this.id == other.getIdLong();
  }
 
  @Override

diff --git a/src/main/java/net/dv8tion/jda/internal/entities/emoji/RichCustomEmojiImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/emoji/RichCustomEmojiImpl.java
@@ -237,11 +237,11 @@ public boolean equals(Object obj)
  {
  if (obj == this)
  return true;
- if (!(obj instanceof RichCustomEmojiImpl))
+ if (!(obj instanceof CustomEmoji))
  return false;
 
- RichCustomEmojiImpl other = (RichCustomEmojiImpl) obj;
- return this.id == other.id && getName().equals(other.getName());
+ CustomEmoji other = (CustomEmoji) obj;
+ return this.id == other.getIdLong();
  }