Merge branch 'RoinujNosde:master' into update

ArmaRealms · Jan 8, 2024 · b6b8644 · b6b8644
2 parents dc179f2 + d4d144f
commit b6b8644
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/hooks/discord/DiscordHook.java b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/hooks/discord/DiscordHook.java
@@ -626,11 +626,7 @@ private Map<ClanPlayer, Member> getDiscordPlayers(@NotNull Clan clan) {
     }
 
     private void updateLeaderRole(@NotNull Member member, @NotNull ClanPlayer clanPlayer, DiscordAction action) {
-        if (!clanPlayer.isLeader()) {
-            return;
-        }
-
-        if (action == ADD) {
+        if (action == ADD && clanPlayer.isLeader()) {
             guild.addRoleToMember(member, leaderRole).queue();
         } else {
             guild.removeRoleFromMember(member, leaderRole).queue();

diff --git a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/uuid/UUIDFetcher.java b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/uuid/UUIDFetcher.java
@@ -27,7 +27,7 @@
 public class UUIDFetcher implements Callable<Map<String, UUID>> {
 
     private static final double PROFILES_PER_REQUEST = 100;
-    private static final String PROFILE_URL = "https://api.mojang.com/profiles/minecraft";
+    private static final String PROFILE_URL = "https://api.minecraftservices.com/minecraft/profile/lookup/bulk/byname";
     private final Gson gson = new Gson();
     private final List<String> names;
     private final boolean rateLimiting;