From d841ed5858ef0e133044e85dbb9c24d3aaa992bb Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 16 Feb 2014 04:12:48 +0000 Subject: [PATCH] - Fix loading skins that have cropped sprite_icons.png with no physical data for missing elements (e.g. the new targeting arrows). Will now return a fully transparent color instead of bailing out with a crash. --- forge-gui/src/main/java/forge/gui/toolbox/FSkin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java index 27b6f29bedf..d3808b5888d 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java @@ -402,7 +402,7 @@ public enum FSkin { x0 = tempCoords[0]; y0 = tempCoords[1]; - color = FSkin.getColorFromPixel(bimPreferredSprite.getRGB(x0, y0)); + color = bimPreferredSprite.getData().getBounds().contains(x0, y0) ? FSkin.getColorFromPixel(bimPreferredSprite.getRGB(x0, y0)) : new Color(0, 0, 0, 0); } }