From b44bb524881ac803ebaf2b1cf8fe2916343d7cbc Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Tue, 22 Nov 2016 18:06:14 -0600
Subject: [PATCH] Update upstream B/CB/S

---
 Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch | 5 +++--
 work/Bukkit                                                  | 2 +-
 work/CraftBukkit                                             | 2 +-
 work/Spigot                                                  | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch
index f06275a20..8bba25648 100644
--- a/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch
@@ -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 {
          }
      }
diff --git a/work/Bukkit b/work/Bukkit
index 5037da9d4..d986a3f77 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 5037da9d4c088c32d235647c7ff37e4ad573926d
+Subproject commit d986a3f774df1628dcfbd25730dfdbfe4471a447
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 691628ab5..b5b0a97d4 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 691628ab5cc38c77b9c1a9bd884c7ce40b96373c
+Subproject commit b5b0a97d44df120d69b6102b7b1f702c8b917cd3
diff --git a/work/Spigot b/work/Spigot
index 261f18109..0f17cfb6c 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 261f18109ea6338aa7a5dfe34fbb87e87945b8e5
+Subproject commit 0f17cfb6c463710def7e7ea8b9b93d91df09231c