From cfff2c5c0983d8d3dbc1dfdd046655f53b73de39 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Mon, 31 Dec 2012 10:57:31 +0100 Subject: [PATCH] The issue was fixed so now we fixed :3 --- .../massivecraft/mcore5/adapter/ItemStackAdapterV2.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/massivecraft/mcore5/adapter/ItemStackAdapterV2.java b/src/com/massivecraft/mcore5/adapter/ItemStackAdapterV2.java index 3c05f75d..63d9aa19 100644 --- a/src/com/massivecraft/mcore5/adapter/ItemStackAdapterV2.java +++ b/src/com/massivecraft/mcore5/adapter/ItemStackAdapterV2.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import org.bukkit.Bukkit; import org.bukkit.Color; import org.bukkit.FireworkEffect; import org.bukkit.enchantments.Enchantment; @@ -85,9 +86,6 @@ public class ItemStackAdapterV2 implements JsonDeserializer, JsonSeri public static final int DEFAULT_COUNT; public static final int DEFAULT_DAMAGE; - // TODO: Awaiting https://bukkit.atlassian.net/browse/BUKKIT-3203 - static final Color DEFAULT_LEATHER_COLOR = Color.fromRGB(0xA06540); - static { ItemStack stack = createItemStack(); @@ -459,7 +457,8 @@ public class ItemStackAdapterV2 implements JsonDeserializer, JsonSeri if (meta2json) { Color color = meta.getColor(); - if (DEFAULT_LEATHER_COLOR.equals(color)) return; + + if (Bukkit.getItemFactory().getDefaultLeatherColor().equals(color)) return; json.addProperty(LEATHER_ARMOR_COLOR, color.asRGB()); }