From fb730050ae7299f3ffc4faa950812b57bfadc845 Mon Sep 17 00:00:00 2001 From: ShirosakiMio <852468399@qq.com> Date: Mon, 12 Aug 2024 19:59:45 +0800 Subject: [PATCH] Update TexturesLoader.java --- .../com/tungsten/fcl/game/TexturesLoader.java | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/FCL/src/main/java/com/tungsten/fcl/game/TexturesLoader.java b/FCL/src/main/java/com/tungsten/fcl/game/TexturesLoader.java index 89c724e8..04781b41 100644 --- a/FCL/src/main/java/com/tungsten/fcl/game/TexturesLoader.java +++ b/FCL/src/main/java/com/tungsten/fcl/game/TexturesLoader.java @@ -115,16 +115,18 @@ public final class TexturesLoader { if (texture.getUrl().equals("offline") && accounts.length == 1) { OfflineAccount account = accounts[0]; - Skin.LoadedSkin loadedSkin = account.getSkin().load(account.getUsername()).run(); - if (loadedSkin != null) { - Bitmap img = loadedSkin.getSkin() == null ? null : loadedSkin.getSkin().getImage(); - if (img == null) { - img = getDefaultSkin(TextureModel.detectUUID(account.getUUID())).getImage(); + Skin skin = account.getSkin(); + if (skin != null) { + Skin.LoadedSkin loadedSkin = skin.load(account.getUsername()).run(); + if (loadedSkin != null) { + Bitmap img = loadedSkin.getSkin() == null ? null : loadedSkin.getSkin().getImage(); + if (img == null) { + img = getDefaultSkin(TextureModel.detectUUID(account.getUUID())).getImage(); + } + return new LoadedTexture(img, metadata); } - return new LoadedTexture(img, metadata); - } else { - return getDefaultSkin(TextureModel.detectUUID(account.getUUID())); } + return getDefaultSkin(TextureModel.detectUUID(account.getUUID())); } Path file = getTexturePath(texture); @@ -160,12 +162,14 @@ public final class TexturesLoader { if (texture.getUrl().equals("offline") && accounts.length == 1) { OfflineAccount account = accounts[0]; - Skin.LoadedSkin loadedSkin = account.getSkin().load(account.getUsername()).run(); - if (loadedSkin != null) { - return loadedSkin.getSkin() == null ? null : loadedSkin.getCape().getImage(); - } else { - return getDefaultSkin(TextureModel.detectUUID(account.getUUID())).getImage(); + Skin skin = account.getSkin(); + if (skin != null) { + Skin.LoadedSkin loadedSkin = skin.load(account.getUsername()).run(); + if (loadedSkin != null) { + return loadedSkin.getSkin() == null ? null : loadedSkin.getCape().getImage(); + } } + return getDefaultSkin(TextureModel.detectUUID(account.getUUID())).getImage(); } Path file = getTexturePath(texture);