diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-02 16:47:25 +0100 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-02 16:47:25 +0100 |
| commit | 2b61a04e36f836526687f68477f286dce678025b (patch) | |
| tree | b0e2be7c0a37c5783c95ee0d2faca1e8b43a1d03 | |
| parent | b6cff41473b8715e1ef72be473b55f39cccfbd2a (diff) | |
| parent | 351edbf4e5dc679dfe65258c6919e9a2a75f7ae8 (diff) | |
| download | craftbukkit-2b61a04e36f836526687f68477f286dce678025b.tar craftbukkit-2b61a04e36f836526687f68477f286dce678025b.tar.gz craftbukkit-2b61a04e36f836526687f68477f286dce678025b.tar.lz craftbukkit-2b61a04e36f836526687f68477f286dce678025b.tar.xz craftbukkit-2b61a04e36f836526687f68477f286dce678025b.zip | |
Merge pull request #22 in SPIGOT/craftbukkit from ~FEARTHE1337/craftbukkit:fixCraftMetaBanner to master
* commit '351edbf4e5dc679dfe65258c6919e9a2a75f7ae8':
Fix CraftMetaBanner serialization.
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java | 9 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java index d61615bf..713d70cd 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java @@ -145,8 +145,13 @@ public class CraftMetaBanner extends CraftMetaItem implements BannerMeta { ImmutableMap.Builder<String, Object> serialize(ImmutableMap.Builder<String, Object> builder) { super.serialize(builder); - builder.put(BASE.BUKKIT, base); - builder.put(PATTERNS.BUKKIT, ImmutableList.copyOf(patterns)); + if(base != null){ + builder.put(BASE.BUKKIT, base); + } + + if(!patterns.isEmpty()){ + builder.put(PATTERNS.BUKKIT, ImmutableList.copyOf(patterns)); + } return builder; } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java index c9738c4f..1f7b5239 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -96,6 +96,7 @@ class CraftMetaItem implements ItemMeta, Repairable { static { classMap = ImmutableMap.<Class<? extends CraftMetaItem>, String>builder() + .put(CraftMetaBanner.class, "BANNER") .put(CraftMetaBook.class, "BOOK") .put(CraftMetaSkull.class, "SKULL") .put(CraftMetaLeatherArmor.class, "LEATHER_ARMOR") |