This commit is contained in:
2025-03-04 18:24:44 +01:00
parent 7468cd4b2f
commit e7350f49af
2 changed files with 16 additions and 12 deletions
@@ -1,5 +1,5 @@
package org.auraclient.auraclient.auth; package org.auraclient.auraclient.auth;
public class AuraPlayer { public class AuraPlayer {
public String cloak; public String cloak = "";
} }
@@ -43,24 +43,23 @@ public class Cloaks {
public static void setCloak(String uuid, String cloakName) { public static void setCloak(String uuid, String cloakName) {
AuraApi.setCloak(cloakName); AuraApi.setCloak(cloakName);
if (!cloakName.isEmpty()) { AuraPlayer player = AuraApi.players.get(uuid);
AuraPlayer player = AuraApi.players.get(uuid); if (player == null) {
if (player == null) { AuraPlayer newPlayer = new AuraPlayer();
AuraPlayer newPlayer = new AuraPlayer(); newPlayer.cloak = cloakName;
newPlayer.cloak = cloakName; AuraApi.players.put(uuid, newPlayer);
AuraApi.players.put(uuid, newPlayer); } else {
} else { player.cloak = cloakName;
player.cloak = cloakName; }
}
if (!cloakName.isEmpty()) {
if (Arrays.asList(ANIMATED_CLOAKS).contains(cloakName)) { if (Arrays.asList(ANIMATED_CLOAKS).contains(cloakName)) {
new Thread(() -> loadAnimatedCloak(uuid, cloakName + ".gif")).start(); new Thread(() -> loadAnimatedCloak(uuid, cloakName + ".gif")).start();
} else { } else {
loadStaticCloak(cloakName + ".png"); loadStaticCloak(cloakName + ".png");
} }
} else {
AuraApi.players.remove(uuid);
} }
} }
/** /**
@@ -134,6 +133,11 @@ public class Cloaks {
} }
String cloakName = AuraApi.players.get(uuid).cloak; String cloakName = AuraApi.players.get(uuid).cloak;
if (cloakName.isEmpty()) {
return null;
}
if (Arrays.asList(ANIMATED_CLOAKS).contains(cloakName)) { if (Arrays.asList(ANIMATED_CLOAKS).contains(cloakName)) {
List<AnimatedCloakData> frames = animatedCloaks.get(uuid); List<AnimatedCloakData> frames = animatedCloaks.get(uuid);
if (frames == null || frames.isEmpty()) { if (frames == null || frames.isEmpty()) {