Update upstream B/CB/S

This commit is contained in:
Zach Brown
2016-11-22 18:06:14 -06:00
parent b36fbd6687
commit b44bb52488
4 changed files with 6 additions and 5 deletions

View File

@@ -190,6 +190,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ private EnchantmentMap enchantments; // Paper
private int repairCost;
private int hideFlag;
private boolean unbreakable;
private static final Set<String> HANDLED_TAGS = Sets.newHashSet();
@@ -208,7 +209,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.repairCost = meta.repairCost;
@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Repairable {
// Spigot end
}
}
- static Map<Enchantment, Integer> buildEnchantments(NBTTagCompound tag, ItemMetaKey key) {
@@ -262,7 +263,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ clone.enchantments = new EnchantmentMap(this.enchantments); // Paper
}
clone.hideFlag = this.hideFlag;
return clone;
clone.unbreakable = this.unbreakable;
@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Repairable {
}
}