GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Fix rare NPE in skin handling code (#3357)

This commit is contained in:
Kevin Ludwig 2022-10-20 20:17:08 +02:00 committed by GitHub
parent ece1b2a8ce
commit e8764c6a81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/org/geysermc/geyser/skin/SkinManager.java
View File

@ -258,8 +258,15 @@ public class SkinManager {
JsonNode skinObject = GeyserImpl.JSON_MAPPER.readTree(new String(Base64.getDecoder().decode(encodedJson), StandardCharsets.UTF_8));
JsonNode textures = skinObject.get("textures");
if (textures != null) {
if (textures == null) {
return null;
}
JsonNode skinTexture = textures.get("SKIN");
if (skinTexture == null) {
return null;
}
String skinUrl = skinTexture.get("url").asText().replace("http://", "https://");
boolean isAlex = skinTexture.has("metadata");
@ -272,8 +279,6 @@ public class SkinManager {
return new GameProfileData(skinUrl, capeUrl, isAlex);
}
return null;
}
/**
* @return default skin with default cape when texture data is invalid, or the Bedrock player's skin if this