Skip to content

Commit 723c3de

Browse files
fn: Fix not trying to get username skins from cache first
1 parent 7726dc4 commit 723c3de

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/SkinManagerImpl.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,7 @@ public SkinData getByIdentifier(String identifier, SkinData.SkinVariant variant)
7272
return getByIdentifier(parsed, variant);
7373
}
7474

75-
// is username
76-
UUID uuid = UUIDFetcher.getUUID(identifier);
77-
if (uuid == null) {
78-
throw new SkinLoadException(SkinLoadException.Reason.INVALID_USERNAME, "(USERNAME = '" + identifier + "')");
79-
}
80-
81-
return getByUUID(uuid, variant);
75+
return getByUsername(identifier, variant);
8276
}
8377

8478
@Override
@@ -98,12 +92,18 @@ public SkinData getByUUID(UUID uuid, SkinData.SkinVariant variant) {
9892

9993
@Override
10094
public SkinData getByUsername(String username, SkinData.SkinVariant variant) throws SkinLoadException {
95+
SkinData cached = tryToGetFromCache(username, variant);
96+
if (cached != null) {
97+
return cached;
98+
}
99+
101100
UUID uuid = UUIDFetcher.getUUID(username);
102101
if (uuid == null) {
103102
throw new SkinLoadException(SkinLoadException.Reason.INVALID_USERNAME, "(USERNAME = '" + username + "')");
104103
}
104+
SkinData dataByUUID = getByUUID(uuid, variant);
105105

106-
return getByUUID(uuid, variant);
106+
return new SkinData(username, dataByUUID.getVariant(), dataByUUID.getTextureValue(), dataByUUID.getTextureSignature());
107107
}
108108

109109
@Override

0 commit comments

Comments
 (0)