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

Fix capes of a *smaller* size throwing an error (#1998)

Browse source
This commit is contained in:
Camotoy 2021-03-04 11:32:56 -05:00 committed by GitHub
parent e0e435fdc5
commit f926b83b33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
connector/src/main/java/org/geysermc/connector/skin/SkinProvider.java
View file

@ -412,7 +412,7 @@ public class SkinProvider {
// if the requested image is a cape // if the requested image is a cape
if (provider != null) { if (provider != null) {
if (image.getWidth() > 64) { if (image.getWidth() > 64 || image.getHeight() > 32) {
// Prevent weirdly-scaled capes from being cut off // Prevent weirdly-scaled capes from being cut off
BufferedImage newImage = new BufferedImage(128, 64, BufferedImage.TYPE_INT_ARGB); BufferedImage newImage = new BufferedImage(128, 64, BufferedImage.TYPE_INT_ARGB);
Graphics g = newImage.createGraphics(); Graphics g = newImage.createGraphics();
@ -420,6 +420,14 @@ public class SkinProvider {
g.dispose(); g.dispose();
image.flush(); image.flush();
image = scale(newImage, 64, 32); image = scale(newImage, 64, 32);
} else if (image.getWidth() < 64 || image.getHeight() < 32) {
// Bedrock doesn't like smaller-sized capes, either.
BufferedImage newImage = new BufferedImage(64, 32, BufferedImage.TYPE_INT_ARGB);
Graphics g = newImage.createGraphics();
g.drawImage(image, 0, 0, image.getWidth(), image.getHeight(), null);
g.dispose();
image.flush();
image = newImage;
} }
} else { } else {
// Very rarely, skins can be larger than Minecraft's default. // Very rarely, skins can be larger than Minecraft's default.