From 723c3de3c43446944f8aea34cfa45f229c4f14fb Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 17 Apr 2025 21:15:01 +0200 Subject: [PATCH] fn: Fix not trying to get username skins from cache first --- .../oliver/fancynpcs/skins/SkinManagerImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/SkinManagerImpl.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/SkinManagerImpl.java index b8325db4..34e44608 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/SkinManagerImpl.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/SkinManagerImpl.java @@ -72,13 +72,7 @@ public class SkinManagerImpl implements SkinManager, Listener { return getByIdentifier(parsed, variant); } - // is username - UUID uuid = UUIDFetcher.getUUID(identifier); - if (uuid == null) { - throw new SkinLoadException(SkinLoadException.Reason.INVALID_USERNAME, "(USERNAME = '" + identifier + "')"); - } - - return getByUUID(uuid, variant); + return getByUsername(identifier, variant); } @Override @@ -98,12 +92,18 @@ public class SkinManagerImpl implements SkinManager, Listener { @Override 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); if (uuid == null) { 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