1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-25 05:44:45 +01:00

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 {
}
}

@ -1 +1 @@
Subproject commit 5037da9d4c088c32d235647c7ff37e4ad573926d
Subproject commit d986a3f774df1628dcfbd25730dfdbfe4471a447

@ -1 +1 @@
Subproject commit 691628ab5cc38c77b9c1a9bd884c7ce40b96373c
Subproject commit b5b0a97d44df120d69b6102b7b1f702c8b917cd3

@ -1 +1 @@
Subproject commit 261f18109ea6338aa7a5dfe34fbb87e87945b8e5
Subproject commit 0f17cfb6c463710def7e7ea8b9b93d91df09231c