mirror of
https://github.com/FancyInnovations/FancyPlugins.git
synced 2025-12-06 07:43:36 +00:00
fn: Fix not trying to get username skins from cache first
This commit is contained in:
@@ -72,13 +72,7 @@ public class SkinManagerImpl implements SkinManager, Listener {
|
|||||||
return getByIdentifier(parsed, variant);
|
return getByIdentifier(parsed, variant);
|
||||||
}
|
}
|
||||||
|
|
||||||
// is username
|
return getByUsername(identifier, variant);
|
||||||
UUID uuid = UUIDFetcher.getUUID(identifier);
|
|
||||||
if (uuid == null) {
|
|
||||||
throw new SkinLoadException(SkinLoadException.Reason.INVALID_USERNAME, "(USERNAME = '" + identifier + "')");
|
|
||||||
}
|
|
||||||
|
|
||||||
return getByUUID(uuid, variant);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -98,12 +92,18 @@ public class SkinManagerImpl implements SkinManager, Listener {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SkinData getByUsername(String username, SkinData.SkinVariant variant) throws SkinLoadException {
|
public SkinData getByUsername(String username, SkinData.SkinVariant variant) throws SkinLoadException {
|
||||||
|
SkinData cached = tryToGetFromCache(username, variant);
|
||||||
|
if (cached != null) {
|
||||||
|
return cached;
|
||||||
|
}
|
||||||
|
|
||||||
UUID uuid = UUIDFetcher.getUUID(username);
|
UUID uuid = UUIDFetcher.getUUID(username);
|
||||||
if (uuid == null) {
|
if (uuid == null) {
|
||||||
throw new SkinLoadException(SkinLoadException.Reason.INVALID_USERNAME, "(USERNAME = '" + username + "')");
|
throw new SkinLoadException(SkinLoadException.Reason.INVALID_USERNAME, "(USERNAME = '" + username + "')");
|
||||||
}
|
}
|
||||||
|
SkinData dataByUUID = getByUUID(uuid, variant);
|
||||||
|
|
||||||
return getByUUID(uuid, variant);
|
return new SkinData(username, dataByUUID.getVariant(), dataByUUID.getTextureValue(), dataByUUID.getTextureSignature());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user