Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The issue was fixed so now we fixed :3

Browse Source
This commit is contained in:
Olof Larsson 2012-12-31 10:57:31 +01:00
parent cf23084db6
commit cfff2c5c09
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/massivecraft/mcore5/adapter/ItemStackAdapterV2.java
View File

@ -9,6 +9,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import org.bukkit.Bukkit;
import org.bukkit.Color; import org.bukkit.Color;
import org.bukkit.FireworkEffect; import org.bukkit.FireworkEffect;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
@ -85,9 +86,6 @@ public class ItemStackAdapterV2 implements JsonDeserializer<ItemStack>, JsonSeri
public static final int DEFAULT_COUNT; public static final int DEFAULT_COUNT;
public static final int DEFAULT_DAMAGE; 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 static
{ {
ItemStack stack = createItemStack(); ItemStack stack = createItemStack();
@ -459,7 +457,8 @@ public class ItemStackAdapterV2 implements JsonDeserializer<ItemStack>, JsonSeri
if (meta2json) if (meta2json)
{ {
Color color = meta.getColor(); 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()); json.addProperty(LEATHER_ARMOR_COLOR, color.asRGB());
} }