GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Null check for player textures in GameProfile

Browse source 
Fixes an issue with the ZNPCs plugin.
This commit is contained in:
Camotoy 2021-12-03 19:24:22 -05:00
parent 4da3edd02c
commit 66819aee83
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
core/src/main/java/org/geysermc/geyser/skin/SkinManager.java
View file

@ -240,7 +240,12 @@ public class SkinManager {
// Likely offline mode // Likely offline mode
return loadBedrockOrOfflineSkin(profile); return loadBedrockOrOfflineSkin(profile);
} }
return loadFromJson(skinProperty.getValue()); GameProfileData data = loadFromJson(skinProperty.getValue());
if (data != null) {
return data;
} else {
return loadBedrockOrOfflineSkin(profile);
}
} catch (IOException exception) { } catch (IOException exception) {
GeyserImpl.getInstance().getLogger().debug("Something went wrong while processing skin for " + profile.getName()); GeyserImpl.getInstance().getLogger().debug("Something went wrong while processing skin for " + profile.getName());
if (GeyserImpl.getInstance().getConfig().isDebugMode()) { if (GeyserImpl.getInstance().getConfig().isDebugMode()) {
@ -254,18 +259,21 @@ public class SkinManager {
JsonNode skinObject = GeyserImpl.JSON_MAPPER.readTree(new String(Base64.getDecoder().decode(encodedJson), StandardCharsets.UTF_8)); JsonNode skinObject = GeyserImpl.JSON_MAPPER.readTree(new String(Base64.getDecoder().decode(encodedJson), StandardCharsets.UTF_8));
JsonNode textures = skinObject.get("textures"); JsonNode textures = skinObject.get("textures");
JsonNode skinTexture = textures.get("SKIN"); if (textures != null) {
String skinUrl = skinTexture.get("url").asText().replace("http://", "https://"); JsonNode skinTexture = textures.get("SKIN");
String skinUrl = skinTexture.get("url").asText().replace("http://", "https://");
boolean isAlex = skinTexture.has("metadata"); boolean isAlex = skinTexture.has("metadata");
String capeUrl = null; String capeUrl = null;
JsonNode capeTexture = textures.get("CAPE"); JsonNode capeTexture = textures.get("CAPE");
if (capeTexture != null) { if (capeTexture != null) {
capeUrl = capeTexture.get("url").asText().replace("http://", "https://"); capeUrl = capeTexture.get("url").asText().replace("http://", "https://");
}
return new GameProfileData(skinUrl, capeUrl, isAlex);
} }
return null;
return new GameProfileData(skinUrl, capeUrl, isAlex);
} }
/** /**