summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2014-12-04 10:10:24 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2014-12-04 10:10:24 +0000
commite2c4f20ed1430a6fde29ba1c82d4e886db9467dc (patch)
tree233bbf23de8e2d3d57a86b97ea6832ecbabe954f /src/main
parent2ba7357b4a9937ea696db558b83f58dfa5ca8b91 (diff)
downloadcraftbukkit-e2c4f20ed1430a6fde29ba1c82d4e886db9467dc.tar
craftbukkit-e2c4f20ed1430a6fde29ba1c82d4e886db9467dc.tar.gz
craftbukkit-e2c4f20ed1430a6fde29ba1c82d4e886db9467dc.tar.lz
craftbukkit-e2c4f20ed1430a6fde29ba1c82d4e886db9467dc.tar.xz
craftbukkit-e2c4f20ed1430a6fde29ba1c82d4e886db9467dc.zip
Serialize baseColor as a string
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java7
1 files changed, 5 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 713d70cd..994b9aaa 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java
@@ -60,7 +60,10 @@ public class CraftMetaBanner extends CraftMetaItem implements BannerMeta {
CraftMetaBanner(Map<String, Object> map) {
super(map);
- base = SerializableMeta.getObject(DyeColor.class, map, BASE.BUKKIT, true);
+ String baseStr = SerializableMeta.getString(map, BASE.BUKKIT, true);
+ if (baseStr != null) {
+ base = DyeColor.valueOf(baseStr);
+ }
Iterable<?> rawPatternList = SerializableMeta.getObject(Iterable.class, map, PATTERNS.BUKKIT, true);
if (rawPatternList == null) {
@@ -146,7 +149,7 @@ public class CraftMetaBanner extends CraftMetaItem implements BannerMeta {
super.serialize(builder);
if(base != null){
- builder.put(BASE.BUKKIT, base);
+ builder.put(BASE.BUKKIT, base.toString());
}
if(!patterns.isEmpty()){