summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJeremy Wood <farachan@gmail.com>2017-06-14 09:17:14 -0400
committermd_5 <git@md-5.net>2017-06-23 12:48:15 +1000
commit1314229dc26eed23606f209b7fe7eaf2fd08a10f (patch)
tree2ddfeca8e6df25b0e7b4c84a01c0ef3ef81d598a /src
parent5e2a23055ef8c0222b08d066ef15dad59e524d14 (diff)
downloadcraftbukkit-1314229dc26eed23606f209b7fe7eaf2fd08a10f.tar
craftbukkit-1314229dc26eed23606f209b7fe7eaf2fd08a10f.tar.gz
craftbukkit-1314229dc26eed23606f209b7fe7eaf2fd08a10f.tar.lz
craftbukkit-1314229dc26eed23606f209b7fe7eaf2fd08a10f.tar.xz
craftbukkit-1314229dc26eed23606f209b7fe7eaf2fd08a10f.zip
SPIGOT-3336: HideFlags will now serialize as a List rather than a Set.
HideFlags will be serialized as a list and deserialized as an Iterable. This will allow maximum flexibility on both the formats it can be serialized into and formats it can be deserialized from.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 7882e889..23f987bb 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -384,7 +384,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
setRepairCost(repairCost);
}
- Set hideFlags = SerializableMeta.getObject(Set.class, map, HIDEFLAGS.BUKKIT, true);
+ Iterable<?> hideFlags = SerializableMeta.getObject(Iterable.class, map, HIDEFLAGS.BUKKIT, true);
if (hideFlags != null) {
for (Object hideFlagObject : hideFlags) {
String hideFlagString = (String) hideFlagObject;
@@ -777,7 +777,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
builder.put(REPAIR.BUKKIT, repairCost);
}
- Set<String> hideFlags = new HashSet<String>();
+ List<String> hideFlags = new ArrayList<String>();
for (ItemFlag hideFlagEnum : getItemFlags()) {
hideFlags.add(hideFlagEnum.name());
}