summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-09-11 20:44:34 +1000
committermd_5 <git@md-5.net>2018-09-11 20:44:34 +1000
commit1cead6280f702aabc1c38f67477876981a583363 (patch)
treef95bdb32d89b5c6084da0d772bc7a65dcd4b4ecb /src
parent953e1d601ac7cda4b5af375f82f13270f0a2a84e (diff)
downloadcraftbukkit-1cead6280f702aabc1c38f67477876981a583363.tar
craftbukkit-1cead6280f702aabc1c38f67477876981a583363.tar.gz
craftbukkit-1cead6280f702aabc1c38f67477876981a583363.tar.lz
craftbukkit-1cead6280f702aabc1c38f67477876981a583363.tar.xz
craftbukkit-1cead6280f702aabc1c38f67477876981a583363.zip
SPIGOT-4363: Bad colours in leather armor
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java
index 5478e9bc..f321d854 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java
@@ -36,7 +36,11 @@ class CraftMetaLeatherArmor extends CraftMetaItem implements LeatherArmorMeta {
if (tag.hasKey(DISPLAY.NBT)) {
NBTTagCompound display = tag.getCompound(DISPLAY.NBT);
if (display.hasKey(COLOR.NBT)) {
- color = Color.fromRGB(display.getInt(COLOR.NBT));
+ try {
+ color = Color.fromRGB(display.getInt(COLOR.NBT));
+ } catch (IllegalArgumentException ex) {
+ // Invalid colour
+ }
}
}
}