From 6717d7e9015f4eb9f6795fbd0efd507b5d958d04 Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Mon, 23 Feb 2026 18:51:28 +0100
Subject: [PATCH] Fixed UUID and cloak

---
 .../org/saturnclient/saturnclient/client/ServiceClient.java | 6 +++---
 .../saturnclient/client/player/SaturnPlayer.java            | 2 +-
 .../saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java b/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java
index 27611bf..fe00d24 100644
--- a/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java
+++ b/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java
@@ -71,7 +71,7 @@ public class ServiceClient {
 
             eventHandlers();
 
-            player(uuid, username);
+            SaturnPlayer.set(new SaturnPlayer(uuid, username, response.cloak(), response.hat()));
 
             Cloaks.loadCloak(uuid);
 
@@ -165,7 +165,7 @@ public class ServiceClient {
     public static void eventHandlers() {
         session.onNotification(ServiceMethods.EmoteEvent, (data) -> {
             for (AbstractClientPlayerEntity player : SaturnClient.client.world.getPlayers()) {
-                if (player.getUuidAsString().replace("-", "").equals(data.from())) {
+                if (player.getUuidAsString().equals(data.from())) {
                     AnimationStack animationStack = PlayerAnimationAccess.getPlayerAnimLayer(player);
                     if (data.emote() != null && !data.emote().isEmpty()) {
                         if (animationStack.isActive() && animationStack.getPriority() == 1000) {
@@ -190,7 +190,7 @@ public class ServiceClient {
 
     public static void player(UUID uuid, String name) {
         try {
-            session.request(ServiceMethods.GetPlayer, uuid.toString().replaceAll("-", ""))
+            session.request(ServiceMethods.GetPlayer, uuid.toString())
                     .whenComplete((user, throwable) -> {
                         if (throwable != null) {
                             throwable.printStackTrace();
diff --git a/src/main/java/org/saturnclient/saturnclient/client/player/SaturnPlayer.java b/src/main/java/org/saturnclient/saturnclient/client/player/SaturnPlayer.java
index bda57c7..f4c935e 100644
--- a/src/main/java/org/saturnclient/saturnclient/client/player/SaturnPlayer.java
+++ b/src/main/java/org/saturnclient/saturnclient/client/player/SaturnPlayer.java
@@ -47,7 +47,7 @@ public class SaturnPlayer {
     }
 
     public static String[] getExternalUUIDAsString() {
-        return PLAYERS.keySet().stream().filter(id -> id.equals(ServiceClient.uuid)).map(UUID::toString)
+        return PLAYERS.keySet().stream().filter(id -> !id.equals(ServiceClient.uuid)).map(UUID::toString)
                 .toArray(String[]::new);
     }
 
diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java b/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java
index f8140df..d624942 100644
--- a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java
+++ b/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java
@@ -62,7 +62,7 @@ public class Cloaks {
      */
     public static void setCloak(String cloakName) {
         if (availableCloaks.contains(cloakName)) {
-            // setCloak(ServiceClient.uuid, cloakName);
+            setCloak(ServiceClient.uuid, cloakName);
             ServiceClient.setCloak(cloakName);
         }
     }