Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-25 09:41:29 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22 in SPIGOT/craftbukkit from ~FEARTHE1337/craftbukkit:fixCraftMetaBanner to master

Browse Source 
* commit 'f75756a2e3542f67099dc24b283cc601360a87cf':
  Fix CraftMetaBanner serialization.

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot 2014-12-02 16:47:25 +01:00
commit 042816193c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java
View File

@ -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;
}

1
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
View File

@ -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")