Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
cbb4fc16 SPIGOT-1916: Attribute modifiers for ItemStacks

CraftBukkit Changes:
8164f4b2 SPIGOT-1916: Attribute modifiers for ItemStacks

Spigot Changes:
38536abd Rebuild patches

Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch

@@ -354,7 +354,7 @@ index 0000000000..0e8acf12e4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 75669bd6ac..6593a52633 100644
+index 7c9c8d401a..b90a02ef6f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {

Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch

@@ -201,7 +201,7 @@ index 1d0580ff7f..2733cda407 100644
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index ef3e27b982..75669bd6ac 100644
+index ae5daa5374..7c9c8d401a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -0,0 +0,0 @@ import java.lang.reflect.Constructor;
@@ -210,32 +210,33 @@ index ef3e27b982..75669bd6ac 100644
  import java.util.Collection;
 +import java.util.Comparator;
  import java.util.HashMap;
+ import java.util.Iterator;
  import java.util.List;
- import java.util.Map;
- import java.util.NoSuchElementException;
- 
+@@ -0,0 +0,0 @@ import com.google.common.collect.SetMultimap;
+ import net.minecraft.server.EnumItemSlot;
+ import net.minecraft.server.GenericAttributes;
  import net.minecraft.server.IChatBaseComponent;
 +import com.google.common.collect.ImmutableSortedMap;
  import net.minecraft.server.NBTBase;
  import net.minecraft.server.NBTTagCompound;
  import net.minecraft.server.NBTTagList;
-@@ -0,0 +0,0 @@ import java.util.Arrays;
+@@ -0,0 +0,0 @@ import java.io.IOException;
+ import java.util.Arrays;
  import java.util.EnumSet;
- import java.util.HashSet;
  import java.util.Set;
 +import java.util.TreeMap;
  import java.util.logging.Level;
  import java.util.logging.Logger;
- import net.minecraft.server.ChatComponentText;
+ import net.minecraft.server.EnumChatFormat;
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
      private IChatBaseComponent displayName;
      private IChatBaseComponent locName;
      private List<String> lore;
 -    private Map<Enchantment, Integer> enchantments;
 +    private EnchantmentMap enchantments; // Paper
+     private Multimap<Attribute, AttributeModifier> attributeModifiers;
      private int repairCost;
      private int hideFlag;
-     private boolean unbreakable;
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
      private static final Set<String> HANDLED_TAGS = Sets.newHashSet();
  
@@ -253,7 +254,7 @@ index ef3e27b982..75669bd6ac 100644
 +            this.enchantments = new EnchantmentMap(meta.enchantments); // Paper
          }
  
-         this.repairCost = meta.repairCost;
+         if (meta.hasAttributeModifiers()) {
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
          }
      }
@@ -309,8 +310,8 @@ index ef3e27b982..75669bd6ac 100644
 -                clone.enchantments = new HashMap<Enchantment, Integer>(this.enchantments);
 +                clone.enchantments = new EnchantmentMap(this.enchantments); // Paper
              }
-             clone.hideFlag = this.hideFlag;
-             clone.unbreakable = this.unbreakable;
+             if (this.hasAttributeModifiers()) {
+                 clone.attributeModifiers = HashMultimap.create(this.attributeModifiers);
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
          }
      }