summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorBuildTools <unconfigured@null.spigotmc.org>2014-12-02 15:29:04 +0100
committerBuildTools <unconfigured@null.spigotmc.org>2014-12-02 15:29:04 +0100
commit351edbf4e5dc679dfe65258c6919e9a2a75f7ae8 (patch)
treec987291b3e9d58672eed2fd71523d33a40d15e46 /src/main
parent275603d37acd74bbb6087d657a68b67aa2323c8a (diff)
downloadcraftbukkit-351edbf4e5dc679dfe65258c6919e9a2a75f7ae8.tar
craftbukkit-351edbf4e5dc679dfe65258c6919e9a2a75f7ae8.tar.gz
craftbukkit-351edbf4e5dc679dfe65258c6919e9a2a75f7ae8.tar.lz
craftbukkit-351edbf4e5dc679dfe65258c6919e9a2a75f7ae8.tar.xz
craftbukkit-351edbf4e5dc679dfe65258c6919e9a2a75f7ae8.zip
Fix CraftMetaBanner serialization.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java9
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java1
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")