twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 20:52:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update upstream B/CB/S

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch
View File

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

2
work/Bukkit

Submodule work/Bukkit updated: 5037da9d4c...d986a3f774

2
work/CraftBukkit

Submodule work/CraftBukkit updated: 691628ab5c...b5b0a97d44

2
work/Spigot

Submodule work/Spigot updated: 261f18109e...0f17cfb6c4