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

bundabrg · Mar 4, 2021 · f926b83 · f926b83
1 parent e0e435f
commit f926b83
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/connector/src/main/java/org/geysermc/connector/skin/SkinProvider.java b/connector/src/main/java/org/geysermc/connector/skin/SkinProvider.java
@@ -412,14 +412,22 @@ private static byte[] requestImage(String imageUrl, CapeProvider provider) throw
 
         // if the requested image is a cape
         if (provider != null) {
-            if (image.getWidth() > 64) {
+            if (image.getWidth() > 64 || image.getHeight() > 32) {
                 // Prevent weirdly-scaled capes from being cut off
                 BufferedImage newImage = new BufferedImage(128, 64, BufferedImage.TYPE_INT_ARGB);
                 Graphics g = newImage.createGraphics();
                 g.drawImage(image, 0, 0, image.getWidth(), image.getHeight(), null);
                 g.dispose();
                 image.flush();
                 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 {
             // Very rarely, skins can be larger than Minecraft's default.