Improve handling of Guild#getMaxEmotes (#1080)

Make it so the feature MORE_EMOJI is taken into concideration when calling Guild#getMaxEmotes
discord-jda · Aug 15, 2019 · cfa07ec · cfa07ec
1 parent cc11f87
commit cfa07ec
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/net/dv8tion/jda/api/entities/Guild.java b/src/main/java/net/dv8tion/jda/api/entities/Guild.java
@@ -411,15 +411,15 @@ default int getMaxBitrate()
 
     /**
      * The maximum amount of emotes a guild can have based on the guilds boost tier.
-     * This does not take into account if the guild has the MORE_EMOJI feature.
      *
      * @return The maximum amount of emotes
      *
      * @since 4.0.0
      */
     default int getMaxEmotes()
     {
-        return getBoostTier().getMaxEmotes();
+        int maxEmotes = getFeatures().contains("MORE_EMOJI") ? 200 : 50;
+        return Math.max(maxEmotes, getBoostTier().getMaxEmotes());
     }
 
     /**